zouling 4 недель назад
Родитель
Сommit
e2f7ed1f5a

+ 1 - 1
src/components/FileUploads/index.vue

@@ -73,7 +73,7 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5
+      default: 10000
     },
     // 大小限制(MB)
     fileSize: {

+ 3 - 0
src/views/project/add.vue

@@ -359,6 +359,9 @@
           span{background: #1890FF;color: #FFFFFF;border: none;}
 
         }
+        .list{
+          .cir{background: #00A854;}
+        }
       }
       &.finish{
          .line{background-color: #1890FF !important;}

+ 1 - 1
src/views/project/fourthInfoForm.vue

@@ -24,7 +24,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="6">
-							<el-form-item label="万元产值能耗" prop="wycznh">
+							<el-form-item label="万元产值能耗(吨/万元)" prop="wycznh">
 								<el-input placeholder="请输入万元产值能耗" v-model="info.wycznh" />
 							</el-form-item>
 						</el-col>

+ 1 - 2
src/views/zhaoshang/Information/firstInfoForm.vue

@@ -159,7 +159,7 @@
           </el-row>
         </div>
         <div class="ftab flexc">
-          <div class="line"></div>实际投资情况
+          <div class="line"></div>用地情况
         </div>
         <div class="rowbox">
           <el-row :gutter="22" style="margin-top: 10px;" >
@@ -300,7 +300,6 @@ export default {
         if(newVal&&newVal.zsyzFjList){
           this.tableData=JSON.parse(JSON.stringify(newVal.zsyzFjList))
         }
-        console.log(this.tableData)
       },
       deep: true
     },

+ 8 - 1
src/views/zhaoshang/Information/fourthInfoForm.vue

@@ -80,7 +80,7 @@
                          <img class="imgb" src="@/assets/images/project/upb.png"/>
                        </div>预览
                      </div>
-                     <div class="btna flexc coc" >
+                     <div class="btna flexc coc" @click="handleDownload(scope.row)">
                        <div class="imgs">
                          <img class="imga" src="@/assets/images/project/upc.png"/>
                        </div>下载
@@ -163,6 +163,13 @@ export default {
         // ]
       }
     }
+  },
+  methods:{
+    handleDownload(row){
+          var name = row.fjName;
+          var url = row.fjUrl;
+          this.$download.resource(url,false)
+    }
   }
 }
 </script>

+ 68 - 29
src/views/zhaoshang/Information/index.vue

@@ -42,7 +42,7 @@
                   <span>建设环节
                   </span>
                 </div>
-                <third-info-form ref="thirdInfo" :info="infojs"></third-info-form>
+                <third-info-form ref="thirdInfo" :info="infojs" :jdqkData="jdqkData"></third-info-form>
                 </el-tab-pane>
               <el-tab-pane  name="fourth">
                 <div slot="label" class="tab flexc">
@@ -74,7 +74,8 @@
   import {addKgxx, updateKgxx, delKgxx, getKgxx,getKgxxNum,listKgxx } from "@/api/zhaoshang/kgxx"
   import {addJsxx, updateJsxx, delJsxx, getJsxx,getJsxxNum,listJsxx } from "@/api/zhaoshang/jsxx"
   import {addTcxx, updateTcxx, delTcxx, getTcxx,getTcxxNum,listTcxx } from "@/api/zhaoshang/tcxx"
-  import {listMonth,getMonth,delMonth,addMonth,updateMonth} from "@/api/zhaoshang/month"
+  import {listMonth} from "@/api/zhaoshang/month"
+  import {listJdqk} from "@/api/zhaoshang/jdqk"
   export default{
     components:{
       firstInfoForm,secondInfoForm,thirdInfoForm,fourthInfoForm
@@ -102,6 +103,7 @@
     cylbOptions:[],
     qybjOptions:[],
     jsxmjzData:[],
+    jdqkData:[],//建工进度情况
       }
     },
 	created() {
@@ -128,33 +130,70 @@
       },
       handleClick(){
        console.log(this.activeName)
-	   if(this.activeName == 'first'){
-		   // 签约
-		     getQyxx(this.id).then(response => {
-		       this.infoqy = response.data||{}
-		     })
-	   }else if(this.activeName == 'second'){
-		   // 开工
-		   getKgxxNum(this.$route.query.bh).then(response => {
-		     this.infokg = response.data||{}
-		   })
-	   }else if(this.activeName == 'third'){
-		   // 建设
-		   getJsxxNum(this.$route.query.bh).then(response => {
-		     this.infojs = response.data||{}
-		   })
-	   }else if(this.activeName == 'fourth'){
-		   // 投产
-       getTcxxNum(this.$route.query.bh).then(response => {
-         this.infotc = response.data||{}
-       })
-       var params={
-         xmbh:this.$route.query.bh
-       }
-       listMonth(params).then(res=>{
-          this.jsxmjzData=res.rows
-       })
-	   }
+          if(this.activeName == 'first'){
+            // 签约
+              getQyxx(this.id).then(response => {
+                this.infoqy = response.data||{}
+              })
+          }else if(this.activeName == 'second'){
+            // 开工
+            getKgxxNum(this.$route.query.bh).then(response => {
+              this.infokg = response.data||{}
+            })
+          }else if(this.activeName == 'third'){
+            // 建设
+            getJsxxNum(this.$route.query.bh).then(response => {
+              this.infojs = response.data||{}
+            })
+            this.listJdqk()
+          }else if(this.activeName == 'fourth'){
+            // 投产
+            getTcxxNum(this.$route.query.bh).then(response => {
+              this.infotc = response.data||{}
+            })
+            var params={
+              xmbh:this.$route.query.bh
+            }
+            listMonth(params).then(res=>{
+               this.jsxmjzData=res.rows
+            })
+          }
+      },
+      listJdqk(){
+        var params={
+              xmbh:this.$route.query.bh
+            }
+         listJdqk(params).then(response => {
+           this.jdqkData = response.rows;
+          this.jdqkData.filter(rou=>{
+        			 if(rou.tdcrzje == null || rou.tdcrzje ==''){
+        				 rou.tdcrzjes = 0
+        			 }else{
+        				 rou.tdcrzjes = rou.tdcrzje
+        			 }
+        			 if(rou.cftrje == null || rou.cftrje ==''){
+        			 	rou.cftrjes = 0
+        			 }else{
+        				 rou.cftrjes = rou.cftrje
+        			 }
+        			 if(rou.sbqd == null || rou.sbqd ==''){
+        			 	rou.sbqds = 0
+        			 }else{
+        				 rou.sbqds = rou.sbqd
+        			 }
+        			 if(rou.fpje == null || rou.fpje ==''){
+        			 	rou.fpjes = 0
+        			 }else{
+        				 rou.fpjes = rou.fpje
+        			 }
+        			 if(rou.htje == null || rou.htje ==''){
+        			 	rou.htjes = 0
+        			 }else{
+        				 rou.htjes = rou.htje
+        			 }
+        			 rou.shiji = (rou.tdcrzjes - 0) +  (rou.cftrjes - 0) +(rou.sbqds - 0)+(rou.fpjes - 0)+(rou.htjes - 0)
+        })
+         })
       }
     }
   }

+ 28 - 34
src/views/zhaoshang/Information/secondInfoForm.vue

@@ -61,10 +61,9 @@
         </div>
         <div class="rowbox">
             <el-table  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
-                <el-table-column align="center" prop="fjlx" label="附件类型"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="name" label="文件名称"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="dx" label="附件大小"  width="15%"> </el-table-column>
-                <el-table-column align="center" prop="time" label="上传时间"  width="15%"> </el-table-column>
+                <el-table-column align="center" type="index" label="序号"  width="10%"> </el-table-column>
+                <el-table-column align="center" prop="fjName" label="文件名称"  width="40%"> </el-table-column>
+
                 <el-table-column align="center" label="操作" width="30%">
                   <template slot-scope="scope">
                    <div class="flexcc">
@@ -73,16 +72,16 @@
                          <img class="imgb" src="@/assets/images/project/upb.png"/>
                        </div>预览
                      </div>
-                     <div class="btna flexc coc">
+                     <div class="btna flexc coc" @click="handleDownload(scope.row)">
                        <div class="imgs">
                          <img class="imga" src="@/assets/images/project/upc.png"/>
                        </div>下载
                      </div>
-                     <div class="btna flexc cod">
+                     <!-- <div class="btna flexc cod">
                        <div class="imgs">
                          <img class="imgc" src="@/assets/images/project/upd.png"/>
                        </div>删除
-                     </div>
+                     </div> -->
                    </div>
                   </template>
                 </el-table-column>
@@ -102,37 +101,32 @@ export default {
       default: null
     }
   },
+  watch: {
+    info: {
+      handler(newVal, oldVal) {
+        if(newVal&&newVal.zsyzFjList){
+          this.tableData=JSON.parse(JSON.stringify(newVal.zsyzFjList))
+        }
+      },
+      deep: true
+    },
+  },
   data() {
     return {
       value:'',
       value1:'',
-      options: [{
-                value: '选项1',
-                label: '黄金糕'
-              }, {
-                value: '选项2',
-                label: '双皮奶'
-              }],
-      tableData: [{
-                fjlx: '项目可行性研究报告',
-                name: '项目可行性研究报告.pdf',
-                dx: '11.8 MB',
-                time: '2025-06-16 16:57',
-      }],
-      rules: {
-        // tableName: [
-        //   { required: true, message: "请输入表名称", trigger: "blur" }
-        // ],
-        // tableComment: [
-        //   { required: true, message: "请输入表描述", trigger: "blur" }
-        // ],
-        // className: [
-        //   { required: true, message: "请输入实体类名称", trigger: "blur" }
-        // ],
-        // functionAuthor: [
-        //   { required: true, message: "请输入作者", trigger: "blur" }
-        // ]
-      }
+      tableData: [],
+      rules: {}
+    }
+  },
+  methods:{
+    getLook(url){
+
+    },
+    handleDownload(row){
+          var name = row.fjName;
+          var url = row.fjUrl;
+          this.$download.resource(url,false)
     }
   }
 }

+ 68 - 68
src/views/zhaoshang/Information/thirdInfoForm.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="rowbox">
           <el-row  :gutter="22">
-            <el-col :span="24" style="padding-left: 0;">
+            <el-col :span="24" style="padding-left: 0;" class="mbstb">
               <el-col :span="6" class="magnt">
               	<div class="xiangw" >
               				<span>建设起止时间:</span>
@@ -30,15 +30,15 @@
 					</div>
 
 				</el-col>
-				<el-col :span="6" class="magnt">
+				<!-- <el-col :span="6" class="magnt">
 					<div class="xiangw">
 									  <span>发票金额:</span>
 									  <span>{{info.yjncz?info.yjncz+"万元":'暂无数据'}}</span>
 					</div>
-				</el-col>
+				</el-col> -->
 
 			</el-col>
-            <el-col :span="24" style="padding-left: 0;" class="magnt mbstb">
+           <!-- <el-col :span="24" style="padding-left: 0;" class="magnt mbstb">
 				<el-col :span="6">
 					<div class="xiangw">
 									  <span>厂房投入金额:</span>
@@ -64,7 +64,7 @@
 									  <span>{{info.yjncz?info.yjncz+"万元":'暂无数据'}}</span>
 					</div>
 				</el-col>
-			</el-col>
+			</el-col> -->
           </el-row>
         </div>
       </div>
@@ -74,48 +74,46 @@
           <div class="flex1 tit">建设进度跟踪</div>
         </div>
         <div class="rowbox">
-          <el-row :gutter="22">
+          <!-- <el-row :gutter="22">
             <el-col :span="6" class="magnt mbstb">
 				<div class="xiangw">
 								  <span>建设周期:</span>
 								  <span>2025-03-14</span>
 				</div>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
         <div class="ftab flexc" style="padding-top: 0;">
           <div class="line"></div>每月项目建设进展情况
           <div class="flex1"></div>
         </div>
         <div class="rowbox" style="width: 100%;overflow: hidden;">
-            <el-table height="213"  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
-                <el-table-column align="center" prop="fjlx" label="建设进展情况"  width="200"> </el-table-column>
-                <el-table-column align="center" prop="name" label="存在的问题"  width="200"> </el-table-column>
-                <el-table-column align="center" prop="dx" label="建设照片"  width="200"> </el-table-column>
-                <el-table-column align="center" prop="time" label="上传时间"  width="200"> </el-table-column>
-                <el-table-column align="center" label="操作" width="300">
-                  <template slot-scope="scope">
-                   <div class="flexcc">
-
-                     <div class="btna flexc cob">
-                       <div class="imgs">
-                         <img class="imgb" src="@/assets/images/project/upb.png"/>
-                       </div>预览
-                     </div>
-                     <div class="btna flexc coc">
-                       <div class="imgs">
-                         <img class="imga" src="@/assets/images/project/upc.png"/>
-                       </div>下载
-                     </div>
-                     <div class="btna flexc cod">
-                       <div class="imgs">
-                         <img class="imgc" src="@/assets/images/project/upd.png"/>
-                       </div>删除
-                     </div>
-                   </div>
-                  </template>
-                </el-table-column>
-              </el-table>
+            <el-table :max-height="213"  :data="tableDataa" border style="width: 100%;margin-bottom: 15px;">
+                    <el-table-column align="center" prop="jzqk" label="建设进展情况"  > </el-table-column>
+                    <el-table-column align="center" prop="czwt" label="存在的问题" > </el-table-column>
+            <el-table-column align="center" prop="shiji" label="实际到位资金"  > </el-table-column>
+            <el-table-column align="center" prop="tdcrzje" label="土地出让金总额" > </el-table-column>
+            <el-table-column align="center" prop="cftrje" label="厂房投入金额" > </el-table-column>
+            <el-table-column align="center" prop="sbqd" label="设备清单金额"  > </el-table-column>
+            <el-table-column align="center" prop="fpje" label="发票金额" > </el-table-column>
+            <el-table-column align="center" prop="htje" label="设备合同金额" > </el-table-column>
+                    <!-- <el-table-column align="center" label="操作" :width="120">
+                      <template slot-scope="scope">
+                       <div class="flexcc">
+                        <div class="btna flexc cob" @click="getLook(scope.row['fjUrl'])">
+                          <div class="imgs">
+                            <img class="imgb" src="@/assets/images/project/upb.png"/>
+                          </div>预览
+                        </div>
+                        <div class="btna flexc coc" @click="handleDownload(scope.row)">
+                          <div class="imgs">
+                            <img class="imga" src="@/assets/images/project/upc.png"/>
+                          </div>下载
+                        </div>
+                       </div>
+                      </template>
+                    </el-table-column> -->
+            </el-table>
         </div>
       </div>
 
@@ -126,28 +124,26 @@
         </div>
         <div class="rowbox">
             <el-table  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
-                <el-table-column align="center" prop="fjlx" label="附件类型"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="name" label="文件名称"  width="20%"> </el-table-column>
-                <el-table-column align="center" prop="dx" label="附件大小"  width="15%"> </el-table-column>
-                <el-table-column align="center" prop="time" label="上传时间"  width="15%"> </el-table-column>
+                <el-table-column align="center" type="index" label="序号"  width="10%"> </el-table-column>
+                <el-table-column align="center" prop="fjName" label="文件名称"  width="40%"> </el-table-column>
                 <el-table-column align="center" label="操作" width="30%">
                   <template slot-scope="scope">
                    <div class="flexcc">
-                     <div class="btna flexc cob">
+                     <div class="btna flexc cob" @click="getLook(scope.row['fjUrl'])">
                        <div class="imgs">
                          <img class="imgb" src="@/assets/images/project/upb.png"/>
                        </div>预览
                      </div>
-                     <div class="btna flexc coc">
+                     <div class="btna flexc coc" @click="handleDownload(scope.row)">
                        <div class="imgs">
                          <img class="imga" src="@/assets/images/project/upc.png"/>
                        </div>下载
                      </div>
-                     <div class="btna flexc cod">
+                     <!-- <div class="btna flexc cod">
                        <div class="imgs">
                          <img class="imgc" src="@/assets/images/project/upd.png"/>
                        </div>删除
-                     </div>
+                     </div> -->
                    </div>
                   </template>
                 </el-table-column>
@@ -165,40 +161,44 @@ export default {
     info: {
       type: Object,
       default: null
+    },
+    jdqkData:{
+      type: Array,
+      default: []
     }
   },
+  watch: {
+    jdqkData: {
+      handler(newVal, oldVal) {
+        this.tableDataa=JSON.parse(JSON.stringify(newVal))
+      },
+      deep: true
+    },
+    info: {
+      handler(newVal, oldVal) {
+        if(newVal&&newVal.zsyzFjList){
+          this.tableData=JSON.parse(JSON.stringify(newVal.zsyzFjList))
+        }
+      },
+      deep: true
+    },
+  },
   data() {
     return {
       value:'',
       value1:'',
-      options: [{
-                value: '选项1',
-                label: '黄金糕'
-              }, {
-                value: '选项2',
-                label: '双皮奶'
-              }],
-      tableData: [{
-                fjlx: '项目可行性研究报告',
-                name: '项目可行性研究报告.pdf',
-                dx: '11.8 MB',
-                time: '2025-06-16 16:57',
-      }],
+      tableData: [],
+      tableDataa:[],
       rules: {
-        // tableName: [
-        //   { required: true, message: "请输入表名称", trigger: "blur" }
-        // ],
-        // tableComment: [
-        //   { required: true, message: "请输入表描述", trigger: "blur" }
-        // ],
-        // className: [
-        //   { required: true, message: "请输入实体类名称", trigger: "blur" }
-        // ],
-        // functionAuthor: [
-        //   { required: true, message: "请输入作者", trigger: "blur" }
-        // ]
       }
     }
+  },
+  methods:{
+    handleDownload(row){
+          var name = row.fjName;
+          var url = row.fjUrl;
+          this.$download.resource(url,false)
+    }
   }
 }
 </script>