Merge branch 'master' of http://60.171.161.56:20000/tjf/zhaoshangyinziV3_UI

src/assets/styles/style.scss

@@ -5,4 +5,6 @@
 .flex0{flex: 0 0 auto;}
 .plr15{padding: 0 15px;}
 .mt22{margin-top: 22px;}
+.mb14{margin-bottom: 14px;}
 .pt7{padding-top: 7px;}
+.pt24{padding-top: 24px;}

src/components/dragFileUpload/index.vue

@@ -251,7 +251,7 @@ export default {
   margin-right: 10px;
 }
 ::v-deep{
-  .el-upload{width: 100%;}
+  .el-upload{width: 50%;margin-right: 29px;}
   .el-upload-dragger{width: 100%;height: 100px;background: #F6FAFF;
   border-radius: 4px;
   border: 1px solid #DADADA;display: flex;flex-direction: column;align-items: center;justify-content: center;}
@@ -265,4 +265,5 @@ export default {
 font-size: 14px;
 color: #222838;}
 }
+.upload-demo{width: 100%;display: flex;}
 </style>

src/views/project/firstInfoForm.vue

@@ -39,31 +39,98 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="22">
+            <el-col :span="6">
+              <el-form-item label="项目录入人" prop="className">
+                <el-input placeholder="输入项目录入人" v-model="info.className" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="职务" prop="functionAuthor">
+                <el-input placeholder="输入职务" v-model="info.functionAuthor" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式" prop="functionAuthor">
+                <el-input placeholder="输入联系方式" v-model="info.functionAuthor" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
       </div>
       <div class="fomebox">
-        <div class="ftop flexc">
+        <div class="ftop flexc mb14">
           <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
           <div class="flex1 tit">签约项目信息</div>
           <el-button type="primary" plain>保存</el-button>
         </div>
         <div class="ftab flexc">
-          <div class="line"></div>投资企业信息
+          <div class="line"></div>项目信息
         </div>
         <div class="rowbox">
           <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="总投资额(万元)" prop="tableName">
+              <el-form-item label="备案总投资额(亿元)" prop="tableName">
                 <el-input placeholder="输入总投资额" v-model="info.tableName" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="固定资产投资额(万元)" prop="tableComment">
-                <el-input placeholder="输入固定资产投资额" v-model="info.tableComment" />
+              <el-form-item label="立项时间" prop="remark">
+                <el-date-picker
+                      v-model="value1"
+                      type="date"
+                      placeholder="年 / 月 / 日">
+                    </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="产业类型" prop="tableComment">
+                <el-select v-model="value" placeholder="选择产业类型">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="建设内容" prop="tableComment">
+                <el-select v-model="value" placeholder="选择建设内容">
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="22">
+            <el-col :span="24">
+              <el-form-item label="投资企业背景" prop="tableComment">
+                <el-input type="textarea" placeholder="输入投资企业背景…" v-model="info.tableComment"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="ftab flexc">
+          <div class="line"></div>投资企业信息
+        </div>
+        <div class="rowbox">
+          <el-row :gutter="22">
+            <el-col :span="6">
+              <el-form-item label="在潜注册公司名称" prop="tableName">
+                <el-input placeholder="输入公司名称" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="注册资金(万元)" prop="tableName">
+                <el-input placeholder="输入注册资金" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="企业注册时间" prop="remark">
                 <el-date-picker
@@ -74,25 +141,20 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="注册资金(万元)" prop="tableComment">
-                <el-input placeholder="输入注册资金" v-model="info.tableComment" />
+              <el-form-item label="经营范围" prop="tableName">
+                <el-input placeholder="输入经营范围" v-model="info.tableName" />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="投资方联系人" prop="tableComment">
-                <el-input placeholder="输入投资方联系人姓名" v-model="info.tableComment" />
+              <el-form-item label="法定代表人" prop="tableComment">
+                <el-input placeholder="输入法定代表人" v-model="info.tableComment" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="投资方联系方式" prop="tableComment">
-                <el-input placeholder="输入投资方联系方式" v-model="info.tableComment" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="22">
-            <el-col :span="24">
-              <el-form-item label="投资企业背景" prop="tableComment">
-                <el-input type="textarea" placeholder="输入投资企业背景…" v-model="info.tableComment"></el-input>
+              <el-form-item label="联系方式" prop="tableComment">
+                <el-input placeholder="输入联系方式" v-model="info.tableComment" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -125,17 +187,27 @@
         <div class="rowbox">
           <el-row :gutter="22">
             <el-col :span="6">
-              <el-form-item label="亩均投资强度(万元 / 亩)" prop="tableName">
+              <el-form-item label="实际投资总额(亿元)" prop="tableName">
+                <el-input placeholder="输入实际投资总额" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实际固定资产投资额(亿元)" prop="tableName">
+                <el-input placeholder="输入实际固定资产投资额" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="亩均投资强度(万元/亩)" prop="tableName">
                 <el-input placeholder="输入亩均投资强度" v-model="info.tableName" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="亩均收入(万元)" prop="tableComment">
+              <el-form-item label="亩均收入(万元/亩)" prop="tableComment">
                 <el-input placeholder="输入亩均收入" v-model="info.tableComment" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计年产值(万元)" prop="tableComment">
+              <el-form-item label="预计年产值(亿元)" prop="tableComment">
                 <el-input placeholder="输入预计年产值" v-model="info.tableComment" />
               </el-form-item>
             </el-col>
@@ -149,18 +221,6 @@
                 <el-input placeholder="输入投资回收周期" v-model="info.tableComment" />
               </el-form-item>
             </el-col>
-            <el-col :span="18">
-              <el-form-item label="建设内容" prop="tableComment">
-                <el-select v-model="value" placeholder="选择建设内容">
-                    <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-              </el-form-item>
-            </el-col>
           </el-row>
         </div>
       </div>
@@ -170,12 +230,12 @@
           <div class="flex1 tit">上传附件</div>
           <el-button type="primary" plain>保存</el-button>
         </div>
-        <div class="rowbox">
+        <div class="rowbox pt24">
             <el-table  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
 				<el-table-column align="center" prop="index" label="序号" width="10%"></el-table-column>
                 <el-table-column align="center" prop="fjlx" label="附件类型"  width="30%"> </el-table-column>
                 <el-table-column align="center" label="操作" width="30%">
-                  <template slot-scope="scope"> 
+                  <template slot-scope="scope">
                    <div class="flexcc">
                      <div class="btna flexc coa">
                        <!-- <div class="imgs">
@@ -198,7 +258,7 @@
                        <div class="imgs">
                          <img class="imgc" src="@/assets/images/project/upd.png"/>
                        </div>删除
-                     </div> -->  
+                     </div> -->
                    </div>
                   </template>
                 </el-table-column>
@@ -265,6 +325,7 @@ export default {
     .el-date-editor.el-input{width: 100%;}
     .el-select{width: 100%;}
     table{width: 100% !important;}
+    .el-table .el-table__header-wrapper th{background: #F6FAFD;}
    }
 }
 .fomebox{background: #FFFFFF;margin-bottom: 15px;border-radius: 4px;
@@ -273,7 +334,7 @@ export default {
     .tit{font-weight: bold;font-size: 16px;color: #222838;}
   }
   .rowbox{padding: 10px 15px 9px;}
-  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 24px 16px 7px;
+  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 7px 16px 0px;
     .line{width: 6px;margin-right: 9px;height: 20px;background: #2777D0;}
   }
   .btna{font-weight: 500;font-size: 14px;padding: 0 13px;

src/views/project/fourthInfoForm.vue

@@ -32,7 +32,7 @@
                 <el-input  placeholder="请输入本年度累计产值" v-model="info.tableName" />
               </el-form-item>
             </el-col>
-            <el-col :span="18">
+            <el-col :span="6">
               <el-form-item label="本会计年度实缴税收(万元)" prop="tableComment">
                 <el-input placeholder="请输入本会计年度实缴税收" v-model="info.tableComment" />
               </el-form-item>
@@ -47,9 +47,69 @@
                 <el-input placeholder="请输入万元产值能耗" v-model="info.functionAuthor" />
               </el-form-item>
             </el-col>
-            
+
+          </el-row>
+        </div>
+      </div>
+      <div class="fomebox">
+        <div class="ftop flexc">
+          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
+          <div class="flex1 tit">年度统计</div>
+          <el-button type="primary" plain>提交</el-button>
+        </div>
+        <div class="rowbox">
+          <el-row  :gutter="22">
+            <el-col :span="6">
+              <el-form-item label="年度" prop="remark">
+                <el-date-picker
+                      v-model="value1"
+                      type="year"
+                      placeholder="选择年">
+                    </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="月份" prop="remark">
+                <el-date-picker
+                      v-model="value1"
+                      type="month"
+                      placeholder="选择月">
+                    </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="22">
+            <el-col :span="6">
+              <el-form-item label="当月累计产值(万元)" prop="tableName">
+                <el-input  placeholder="请输入累计产值" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="当月实缴税收(万元)" prop="tableComment">
+                <el-input placeholder="请输入实缴税收" v-model="info.tableComment" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="当月累计用电(万千瓦时)" prop="className">
+                <el-input placeholder="请输入累计用电" v-model="info.className" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
+
+        <div class="ftab flexc" style="padding-top: 7px;">
+            <div class="line"></div>每月项目建设进展情况
+        </div>
+          <div class="rowbox" style="width: 100%;overflow: hidden;">
+              <el-table height="213"show-summary  :data="tableDataa" border style="width: 100%;margin-bottom: 15px;">
+                  <el-table-column align="center" type="index" label="序号"  width="150"></el-table-column>
+                  <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="500">
+                  </el-table-column>
+                </el-table>
+          </div>
       </div>
       <div class="fomebox">
         <div class="ftop flexc">
@@ -122,6 +182,12 @@ export default {
                 dx: '11.8 MB',
                 time: '2025-06-16 16:57',
       }],
+      tableDataa: [
+        {fjlx: '140',name: '14',dx: '100',time: '2025-06-16 16:57',},
+        {fjlx: '210',name: '21',dx: '80',time: '2025-06-16 16:57',},
+        {fjlx: '97',name: '9.7',dx: '60',time: '2025-06-16 16:57',},
+        {fjlx: '100',name: '10',dx: '90',time: '2025-06-16 16:57',},
+        ],
       rules: {
         // tableName: [
         //   { required: true, message: "请输入表名称", trigger: "blur" }
@@ -150,6 +216,7 @@ export default {
     .el-date-editor.el-input{width: 100%;}
     .el-select{width: 100%;}
     table{width: 100% !important;}
+    .el-table .el-table__header-wrapper th{background: #F6FAFD;}
    }
 }
 .fomebox{background: #FFFFFF;margin-bottom: 15px;border-radius: 4px;
@@ -158,7 +225,7 @@ export default {
     .tit{font-weight: bold;font-size: 16px;color: #222838;}
   }
   .rowbox{padding: 10px 15px 9px;}
-  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 24px 16px 7px;
+  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 7px 16px 0px;
     .line{width: 6px;margin-right: 9px;height: 20px;background: #2777D0;}
   }
   .btna{font-weight: 500;font-size: 14px;padding: 0 13px;

src/views/project/secondInfoForm.vue

@@ -167,15 +167,16 @@ export default {
     .el-date-editor.el-input{width: 100%;}
     .el-select{width: 100%;}
     table{width: 100% !important;}
+    .el-table .el-table__header-wrapper th{background: #F6FAFD;}
    }
 }
-.fomebox{background: #FFFFFF;margin-top: 15px;border-radius: 4px;
+.fomebox{background: #FFFFFF;margin-bottom: 15px;border-radius: 4px;
   .ftop{padding: 10px 17px 10px 16px;border-bottom: 1px solid #E6E6E6;
     .timg{width: 20px;height: 20px;margin-right: 13px;}
     .tit{font-weight: bold;font-size: 16px;color: #222838;}
   }
   .rowbox{padding: 10px 15px 9px;}
-  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 24px 16px 7px;
+  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 7px 16px 0px;
     .line{width: 6px;margin-right: 9px;height: 20px;background: #2777D0;}
   }
   .btna{font-weight: 500;font-size: 14px;padding: 0 13px;

src/views/project/thirdInfoForm.vue

@@ -4,11 +4,22 @@
       <div class="fomebox">
         <div class="ftop flexc">
           <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
-          <div class="flex1 tit">建设信息</div>
-          <el-button type="primary" plain>保存</el-button>
+          <div class="flex1 tit">建设时间</div>
+          <!-- <el-button type="primary" plain>保存</el-button> -->
         </div>
         <div class="rowbox">
           <el-row  :gutter="22">
+            <el-col :span="6">
+              <el-form-item label="建设起止时间" prop="remark">
+                <el-date-picker
+                      v-model="value1"
+                      type="monthrange"
+                      range-separator="至"
+                      start-placeholder="请选择开始时间"
+                      end-placeholder="请选择结束时间">
+                    </el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="竣工时间" prop="remark">
                 <el-date-picker
@@ -27,6 +38,42 @@
                     </el-date-picker>
               </el-form-item>
             </el-col>
+          </el-row>
+        </div>
+      </div>
+      <div class="fomebox">
+        <div class="ftop flexc">
+          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
+          <div class="flex1 tit">建设进度跟踪</div>
+          <!-- <el-button type="primary" plain>保存</el-button> -->
+        </div>
+        <div class="ftab flexc">
+          <div class="line"></div>上报项目建设进展情况
+          <div class="flex1"></div>
+          <el-button type="primary" plain class="upbox" plain >
+            提交
+          </el-button>
+        </div>
+       <div class="rowbox">
+          <el-row :gutter="22">
+            <el-col :span="24" style="margin-bottom: 12px;">
+              <drag-file-upload v-model="form.desc"/>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="建设进展情况" prop="remark">
+                <el-input type="textarea" placeholder="输入项目进展情况…" v-model="info.tableComment"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="存在的问题" prop="remark">
+                <el-input type="textarea" placeholder="输入存在的问题…" v-model="info.tableComment"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实际到位资金(万元)" prop="tableName">
+                <el-input placeholder="实际到位资金(万元)" v-model="info.tableName" />
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="土地出让金总额(万元)" prop="tableName">
                 <el-input placeholder="请输入土地出让金总额" v-model="info.tableName" />
@@ -52,42 +99,10 @@
                 <el-input placeholder="请输入设备合同金额" v-model="info.functionAuthor" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="建设周期" prop="remark">
-                <el-input v-model="input" placeholder="请输入建设周期">
-                  <span slot="suffix" class="txt">月</span>
-                  <i slot="suffix" class="el-input__icon el-icon-arrow-down"></i>
-                </el-input>
-              </el-form-item>
-            </el-col>
           </el-row>
         </div>
-      </div>
-      <div class="fomebox">
-        <div class="ftop flexc">
-          <img class="timg flex0" src="@/assets/images/project/tabtit.png"/>
-          <div class="flex1 tit">建设进度跟踪</div>
-          <el-button type="primary" plain>保存</el-button>
-        </div>
-       <!-- <div class="rowbox">
-          <el-row :gutter="22">
-            <el-col :span="6">
-              <el-form-item label="建设周期" prop="remark">
-                <el-input v-model="input" placeholder="请输入建设周期">
-                  <span slot="suffix" class="txt">月</span>
-                  <i slot="suffix" class="el-input__icon el-icon-arrow-down"></i>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div> -->
         <div class="ftab flexc" style="padding-top: 7px;">
           <div class="line"></div>每月项目建设进展情况
-          <div class="flex1"></div>
-          <el-button type="success" class="upbox" plain @click="dialogFormVisible = true">
-            <img src="@/assets/images/project/upe.png"/>
-            上传建设进度
-          </el-button>
         </div>
         <div class="rowbox" style="width: 100%;overflow: hidden;">
             <el-table height="213"  :data="tableData" border style="width: 100%;margin-bottom: 15px;">
@@ -291,6 +306,7 @@ export default {
       img{width: 12px;height: 12px;margin-right: 2px;}
       // color: #00A854;
     }
+    .el-table .el-table__header-wrapper th{background: #F6FAFD;}
    }
    .infobox{
      .el-dialog__header{border-bottom: 1px solid #E6E6E6;padding: 0;}
@@ -300,7 +316,7 @@ export default {
 .fomebox{background: #FFFFFF;margin-bottom: 15px;border-radius: 4px;
 
   .rowbox{padding: 10px 15px 9px;}
-  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 24px 16px 7px;
+  .ftab{font-weight: bold;font-size: 14px;color: #2777D0;padding: 7px 16px 0px;
     .line{width: 6px;margin-right: 9px;height: 20px;background: #2777D0;}
   }
   .txt{font-weight: 500;padding-right: 34px;