前后:合同上报情况去掉分页;统计履行中的

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -36,7 +36,7 @@ func (s *OilContractService) GetHandOnStatisticsList(queryParam HandOnStatistics
 		" FROM OilContract a " +
 		" LEFT JOIN OilContractReview b ON a.Id = b.ContractId " +
 		" LEFT JOIN Base_Organize c on SecondUnit = c.Id"
-	sql += " WHERE a.ImportStatus > 0 and a.Status < 3 "
+	sql += " WHERE a.ImportStatus > 0 and a.Status = 2 "
 	if queryParam.YearNum > 0 {
 		sql += " AND " + strconv.Itoa(queryParam.YearNum) + " BETWEEN YEAR(a.StartDate) AND YEAR(a.EndDate)"
 	}

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -1849,7 +1849,7 @@ func (this *OilContractController) YearList() {
 func (this *OilContractController) GetNeedEvaList() {
 	var list []contract.OilContract
 	// TODO 加年度
-	sql := ` select a.* from OilContract a left join OilContractReview b on b.ContractId=a.Id where a.ImportStatus > 0 and a.SecondUnit=` + strconv.Itoa(this.User.UnitId) + ` and (b.Status < 0 or b.Status=NULL)  `
+	sql := ` select a.* from OilContract a left join OilContractReview b on b.ContractId=a.Id where a.ImportStatus > 0 and a.Status = 2 and a.SecondUnit=` + strconv.Itoa(this.User.UnitId) + ` and (b.Status < 0 or b.Status is NULL)  `
 	utils.DBE.Sql(sql).Find(&list)
 
 	var dataInfo DataInfo

src/dashoo.cn/frontend_web/src/pages/oilcontract/report/handon-statistics.vue

@@ -49,9 +49,9 @@
         <el-table-column sortable show-overflow-tooltip prop="FinishNum" header-align="center" label="已完成数" align="center"></el-table-column>
         <el-table-column sortable show-overflow-tooltip prop="UnReportNum" header-align="center" label="未上报数" align="center"></el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-      </el-pagination>
+<!--      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"-->
+<!--                     :page-sizes="[50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">-->
+<!--      </el-pagination>-->
     </el-card>
   </div>
 </template>