Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/project/componens/info6.vue

src/api/project/index.js

@@ -380,6 +380,15 @@ export default {
       'json'
     )
   },
+  // 新增或修改年度投资
+  batchSubmitAnnualInvestment(params) {
+    return fetch(
+      '/blade-project-manage-v2/project-dispatch/v2/batch-submit-annual-investment',
+      params,
+      'post',
+      'json'
+    )
+  },
   // 项目前期文件列表
   preliminaryFiles(params) {
     return fetch(

src/views/project/componens/info6.vue

@@ -3,7 +3,7 @@
     title="年度投资情况（单位：万元）"
     class="mt-10"
     :edit-btn="true"
-    @change="change"
+    @edit="change"
     @save="save"
   >
     <el-form>
@@ -26,6 +26,7 @@
             <th v-for="item in month">
               {{ item.month != '合计' ? item.month + '月' : '合计' }}
             </th>
+            <th>合计</th>
           </tr>
         </thead>
         <tbody>
@@ -35,10 +36,11 @@
               <el-input
                 class="th-input"
                 v-model="item.planInvestment"
-                @input="saveOrUpdate(item)"
+                @input="AddUpdateItem(item)"
               >
               </el-input>
             </th>
+            <th>{{ allPlanInvestment }}</th>
           </tr>
           <tr>
             <th style="width: 100px">累计投资</th>
@@ -46,10 +48,11 @@
               <el-input
                 class="th-input"
                 v-model="item.totalInvestment"
-                @input="saveOrUpdate(item)"
+                @input="AddUpdateItem(item)"
               >
               </el-input>
             </th>
+            <th>{{ allTotalInvestment }}</th>
           </tr>
           <tr>
             <th>计划纳统投资</th>
@@ -57,10 +60,11 @@
               <el-input
                 class="th-input"
                 v-model="item.planNtInvestment"
-                @input="saveOrUpdate(item)"
+                @input="AddUpdateItem(item)"
               >
               </el-input>
             </th>
+            <th>{{ allPlanNtInvestment }}</th>
           </tr>
           <tr>
             <th>累计纳统投资</th>
@@ -68,10 +72,11 @@
               <el-input
                 class="th-input"
                 v-model="item.totalNtInvestment"
-                @input="saveOrUpdate(item)"
+                @input="AddUpdateItem(item)"
               >
               </el-input>
             </th>
+            <th>{{ allTotalNtInvestment }}</th>
           </tr>
         </tbody>
       </table>
@@ -198,8 +203,9 @@ export default {
 }
 
 table {
-  width: 1200px;
+  width: 1280px;
   margin: 10px;
+  margin-top: 20px;
 }
 
 thead {
@@ -212,6 +218,7 @@ tr {
 
 th {
   height: 40px;
+  width: 7.69%;
   flex: 1;
   text-align: center;
   border: 1px solid #9c9c9c;