1.汇总表改为树形表格形式展示数据

2.开始添加子项目时，增加终止日和时间区间填写

src/views/base/fundIncomeInfo-list.vue

@@ -102,7 +102,7 @@
             <el-button type="primary" v-if="!row.isSum" size="mini" @click="handleSave(row)" plain>保存</el-button>
           </template>
         </el-table-column>
-        <el-table-column  prop="serialNumber" fixed label="序号">
+        <el-table-column  prop="serialNumber" fixed label="序号" width="120">
             <!-- <div class="item" slot-scope="scope">
                 <el-input size="mini" class="item__input" v-model="scope.row.serialNumber" @blur="save(scope.row)"></el-input>
                 <div class="item__txt">{{scope.row.serialNumber}}</div>
@@ -622,48 +622,13 @@
           var self = this;
           //alert(JSON.stringify(row));
           if(self.checkEmptyInJSON(row)){
-            if(!self.checkIfNumber(row.serialNumber)){
-              self.$message({
-                message: "序号应填写数字，请重新填写！",
-                type: "error",
-              });
-              return 
-            }
-            if(!self.checkIfNumber(row.budgetRevenue)){
-              self.$message({
-                message: "预算收入应填写数字，请重新填写！",
-                type: "error",
-              });
-              return 
-            }
             if(!self.checkIfNumber(row.curMonthReceived)){
               self.$message({
-                message: "本月到账资金应填写数字，请重新填写！",
-                type: "error",
-              });
-              return 
-            }
-            if(!self.checkIfNumber(row.actualTotalRevenue)){
-              self.$message({
-                message: "实际总收入应填写数字，请重新填写！",
+                message: "本月本次到账资金应填写数字，请重新填写！",
                 type: "error",
               });
               return 
             }
-            if(!self.checkIfNumber(row.accumulatedArrears)){
-              self.$message({
-                message: "累计欠费应填写数字，请重新填写！",
-                type: "error",
-              });
-              return 
-            } 
-          }
-          else{
-            self.$message({
-              message: "此条数据所有数据全为空，请先填入数据再保存!",
-              type: "error",
-            });
-            return;
           }
 
           //alert(JSON.stringify(row))

src/views/base/sectionsSummary-list.vue

@@ -55,10 +55,13 @@
       </el-row>
       <el-table
         :data="tableData"
-        height="500"
+        min-height="450"
         v-loading="loading"
+        row-key="id"
         :row-class-name="tableRowClassName"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       >
+        <el-table-column  prop="serialNum"  label="序号" width="250"></el-table-column>
         <el-table-column  prop="name"  label="收入子项目" width="300"></el-table-column>
         <el-table-column  prop="budgetRevenue"  label="预算收入(当前)">
             <template slot-scope="scope">
@@ -80,7 +83,19 @@
             {{formaNum(scope.row.accumulatedArrears)}}
           </template>
         </el-table-column>
-        <el-table-column    label="收入完成比率"></el-table-column>
+        <el-table-column  prop="percentage"  label="收入完成比率">
+          <template slot-scope="scope">
+            <span v-if="scope.row.percentage<50" style="color:#F56C6C">
+              {{scope.row.percentage}}%
+            </span>
+            <span v-if="scope.row.percentage>50&&scope.row.percentage<100" style="color:#E6A23C">
+              {{scope.row.percentage}}%
+            </span>
+            <span v-if="scope.row.percentage==100" style="color:#67C23A">
+              {{scope.row.percentage}}%
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column    label="累计已支出金额"></el-table-column>
         <el-table-column    label="实际收入节余"></el-table-column>
         <el-table-column    label="备注"></el-table-column>
@@ -183,6 +198,8 @@
                     //分页查看
                     var page = jsonData.data;
 
+                    console.log(jsonData.data)
+
                     self.tableData = page.data;
                     self.totalPages = page.totalPages;
                     self.totalElements = page.recordsTotal;
@@ -305,6 +322,9 @@
           if (row.isSum) {
             return 'success-row';
           }
+          if (row.isSum2) {
+            return 'warning-row';
+          }
           else{
             return ''; 
           }
@@ -342,4 +362,7 @@
     .el-table .success-row {
       background: #f0f9eb;
     }
+    .el-table .warning-row {
+    background: oldlace;
+  }
 </style>

src/views/base/templateDepartTitle-edit.vue

@@ -50,7 +50,7 @@
               >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="收入类型" prop="incomeType">
+          <!-- <el-form-item label="收入类型" prop="incomeType">
             <el-select v-model="formModel.incomeType" clearable placeholder="请选择" style="width: 300px" >
                 <el-option
                   v-for="item in typeList"
@@ -59,7 +59,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="终止日" prop="endDate">
             <el-date-picker
               style="width: 300px"

src/views/base/templateDepartment-detail.vue

@@ -24,7 +24,7 @@
             <el-table 
                 class="compact-table"
                 :data="formModel.optionList" >
-                <el-table-column prop="serialNum" label="序号" ></el-table-column>
+                <el-table-column prop="serialNum" label="序号" width="100"></el-table-column>
                 <el-table-column prop="name" label="名称" width="200"></el-table-column>
                 <el-table-column prop="budgetRevenue" label="预算收入">
                   <template slot-scope="{row}">
@@ -32,7 +32,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="incomeTimeRange" label="收入时间区间" width="150"></el-table-column>
-                <el-table-column prop="incomeTypeN" label="收入类型"></el-table-column>
+                <!-- <el-table-column prop="incomeTypeN" label="收入类型"></el-table-column> -->
                 <el-table-column prop="endDate" label="终止日" width="130"></el-table-column>
                 <el-table-column prop="departmentNames" label="部门" width="180"></el-table-column>
                 <el-table-column prop="isSum" label="是否合计">

src/views/base/templateInfo-option-list.vue

@@ -7,7 +7,7 @@
       style="text-align: left;"
       @close="closeDialog"
       :close-on-click-modal="false"
-      width="1200px"
+      width="1530px"
     >
       <div class="user-panel" v-loading="loading">
         <el-form
@@ -20,7 +20,7 @@
             <el-table 
                 class="compact-table"
                 :data="formModel.optionList" >
-                <el-table-column prop="serialNum" label="序号" width="150">
+                <el-table-column prop="serialNum" label="序号" width="120">
                     <template slot-scope="scope">
                         <el-form-item
                         :prop="'optionList.' + scope.$index + '.serialNum'"
@@ -31,24 +31,24 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="名称" width="250">
+                <el-table-column prop="name" label="名称" width="200">
                     <template slot-scope="scope">
                         <el-form-item
                         :prop="'optionList.' + scope.$index + '.name'"
                         :rules="ruleValidate['name']"
                         >
-                        <el-input placeholder="名称"  v-model="scope.row.name"  size="mini" style="width:200px"> 
+                        <el-input placeholder="名称"  v-model="scope.row.name"  size="mini" style="width:150px"> 
                         </el-input>
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="isSum" label="是否合计" width="150">
+                <el-table-column prop="isSum" label="是否合计" width="100">
                     <template slot-scope="scope">
                         <el-form-item
                         :prop="'optionList.' + scope.$index + '.isSum'"
                         :rules="ruleValidate['isSum']"
                         >
-                        <el-select v-model="scope.row.isSum" placeholder="请选择" size="mini" style="width:130px">
+                        <el-select v-model="scope.row.isSum" placeholder="请选择" size="mini" style="width:80px">
                           <el-option
                             v-for="item in isSumList"
                             :key="item.value"
@@ -59,17 +59,67 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="budgetRevenue" label="预算收入" width="180">
+                <el-table-column prop="budgetRevenue" label="预算收入（元）" width="160">
                     <template slot-scope="scope">
                         <el-form-item
                         :prop="'optionList.' + scope.$index + '.budgetRevenue'"
                         :rules="ruleValidate['budgetRevenue']"
                         >
-                        <el-input-number v-if="!scope.row.isSum" placeholder="预算收入"  v-model="scope.row.budgetRevenue"  size="mini" style="width:150px"> 
+                        <el-input-number v-if="!scope.row.isSum" placeholder="预算收入"  v-model="scope.row.budgetRevenue"  size="mini" style="width:130px"> 
                         </el-input-number>
                         </el-form-item>
                     </template>
                 </el-table-column>
+                <el-table-column prop="incomeTimeRangeArr" label="收入区间" width="250">
+                    <template slot-scope="scope">
+                        <el-form-item
+                        :prop="'optionList.' + scope.$index + '.incomeTimeRangeArr'"
+                        :rules="ruleValidate['incomeTimeRangeArr']"
+                        >
+                          <el-date-picker
+                            v-if="!scope.row.isSum"
+                            v-model="scope.row.incomeTimeRangeArr"
+                            size="mini"
+                            style="width:230px"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd">
+                          </el-date-picker> 
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="endDate" label="终止日" width="160">
+                    <template slot-scope="scope">
+                        <el-form-item
+                        :prop="'optionList.' + scope.$index + '.endDate'"
+                        :rules="ruleValidate['endDate']"
+                        >
+                          <el-date-picker
+                            v-if="!scope.row.isSum"
+                            size="mini"
+                            v-model="scope.row.endDate"
+                            style="width:130px"
+                            type="date"
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期">
+                          </el-date-picker>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="chargePerson" label="责任人" width="100">
+                    <template slot-scope="scope">
+                        <el-form-item
+                        :prop="'optionList.' + scope.$index + '.chargePerson'"
+                        :rules="ruleValidate['chargePerson']"
+                        >
+                        <el-input v-if="!scope.row.isSum" placeholder="责任人"  v-model="scope.row.chargePerson"  size="mini" style="width:80px"> 
+                        </el-input>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="departmentIdArr" label="部门" width="180">
                     <template slot-scope="scope">
                         <el-form-item
@@ -87,13 +137,13 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
-                <el-table-column prop="index" label="排序号" width="120">
+                <el-table-column prop="index" label="排序号" width="100">
                     <template slot-scope="scope">
                         <el-form-item
                         :prop="'optionList.' + scope.$index + '.index'"
                         :rules="ruleValidate['index']"
                         >
-                        <el-input placeholder="排序号"  v-model="scope.row.index"  size="mini" style="width:100px"> 
+                        <el-input placeholder="排序号"  v-model="scope.row.index"  size="mini" style="width:80px"> 
                         </el-input>
                         </el-form-item>
                     </template>
@@ -210,12 +260,14 @@
         this.formModel.optionList.push({
             serialNumber: "",
             name: "",
+            incomeTimeRangeArr:null
         });
       },
       handleInsert(row) {
         this.formModel.optionList.push({
             serialNumber: "",
             name: "",
+            incomeTimeRangeArr:null
           });
       },
       handleDelete(row) {