Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1830,8 +1830,9 @@ func (this *OilSupplierController) DeleteAllEntity() {
 		return
 	}
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	err := svc.DeleteEntityBytbl(OilSupplierCertName, "SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
+	err := svc.DeleteEntityBytbl(OilSupplierCertSubName, "SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
 	err = svc.DeleteEntityBytbl(OilSupplierFileName, "SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
+	err = svc.DeleteEntityBytbl(OilSupplierCertName, "SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")
 
 	// TODO: 删除准入范围和资质对应关系表
 	// err = svc.DeleteEntityBytbl(OilSupplierCert2FileName, "SupplierId="+Id+" and SupplierTypeCode='"+SupplierTypeCode+"'")

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -711,7 +711,7 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 	supplierCertEntity.BusinessKey = businessKey
 	supplierCertEntity.WorkflowId = processInstanceId
 	supplierCertEntity.CommitComId = unitId
-	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols) // 不能在下一步工作流完成后再更新，会找不到分办人
 
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
@@ -733,9 +733,9 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 // @router /unit-audit/:id [post]
 func (this *OilSupplierCertController) UnitAuditEntity() {
 	certId := this.Ctx.Input.Param(":id")
-	firstAudit := this.GetString("FirstAudit")
-	secondAudit := this.GetString("SecondAudit")
-	thirdAudit := this.GetString("ThirdAudit")
+	firstAudit := this.GetString("FirstAudit")   // 初审人ID
+	secondAudit := this.GetString("SecondAudit") // 复审人ID
+	thirdAudit := this.GetString("ThirdAudit")   // 专业处室部门ID
 	// typeCode := this.GetString("TypeCode")
 	AuditRemark := this.GetString("AuditRemark")
 	userId := this.User.Id
@@ -760,6 +760,9 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 		}
 	}()
 
+	if firstAudit == "" || secondAudit == "" {
+		panic("请选择审批人")
+	}
 	//取出准入表信息
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
@@ -804,7 +807,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
 	supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
 	supplierCertEntity.CommitComId = strconv.Itoa(unitId)
-	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols) // 不能在下一步工作流完成后再更新，会找不到初审人
 
 	var ActiComplete workflow.ActiCompleteVM
 	ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
@@ -816,7 +819,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 	if receiveVal != "true" {
-		panic("工作流异常，请联系管理员！" + receiveVal)
+		panic("提交失败，请刷新！")
 	}
 }
 
@@ -849,6 +852,10 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 		}
 	}()
 
+	if firstAudit == "" || secondAudit == "" {
+		panic("请选择审批人")
+	}
+
 	// 取出准入表信息
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
@@ -877,7 +884,7 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
 	ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 	if receiveVal != "true" {
-		panic("工作流异常，请联系管理员！" + receiveVal)
+		panic("任务已审批，请刷新！")
 	}
 }
 
@@ -1488,7 +1495,7 @@ func (this *OilSupplierCertController) SendingSMSSupplierFile() {
 	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 	month, _ := strconv.Atoi(paramSvc.GetBaseparameterMessage("GFGL", "paramset", "QualificationMonth"))
 	var expireFile []supplier.ExpireFile
-	where := " b.EffectDate LIKE '%" + time.Now().AddDate(0, month, 0).Format("2006-01-02") + "%'"
+	where := " DATE_FORMAT(b.EffectDate, '%Y-%m-%d') = '" + time.Now().AddDate(0, month, 0).Format("2006-01-02") + "'"
 	err := svcsupp.GetExpireFile(OilSupplierName, OilSupplierFileName, &expireFile, where)
 
 	if err == nil {
@@ -1523,32 +1530,59 @@ func (this *OilSupplierCertController) ChangeSupplierStatus() {
 
 	svcsupp := supplier.GetOilSupplierService(utils.DBE)
 	var fileData []supplier.ExpireFileList
-	where := " b.EffectDate <= '" + time.Now().AddDate(0, 0, -1).Format("2006-01-02") + "'"
+	where := " b.EffectDate <= '" + time.Now().Format("2006-01-02") + "'"
 	svcsupp.GetExpireFileList(OilSupplierName, OilSupplierFileName, &fileData, where)
 
 	for _, item := range fileData {
-		var sert suppliercert.OilSupplierCert
 		cols := []string{
 			"InFlag",
 			"Remark",
 		}
-		sert.InFlag = "2"
-		sert.Remark = "资质过期"
-
-		where := "SupplierId=" + strconv.Itoa(item.Id) + " AND InFlag = '1'"
+		where := "SupplierId=" + strconv.Itoa(item.Id)
 		if item.SupplierTypeCode != "000" {
 			where = where + " and SupplierTypeCode='" + item.SupplierTypeCode + "'"
 		}
-		svcsupp.UpdateEntityBywheretbl(OilSupplierCertName, &sert, cols, where)
+		var tmpCertList []suppliercert.OilSupplierCert
+		svcsupp.GetEntitysByWhere(OilSupplierCertName, where, &tmpCertList)
+		for _, tmpCertItem := range tmpCertList {
+			if tmpCertItem.InFlag == "1" {
+				tmpCertItem.InFlag = "2"
+				if tmpCertItem.ApplyTime.Before(time.Now()) {
+					// 年审到期
+					tmpCertItem.Remark = strings.Trim("年审过期,资质过期," + tmpCertItem.Remark, ",")
+				} else {
+					tmpCertItem.Remark = strings.Trim("资质过期," + tmpCertItem.Remark, ",")
+				}
+				svcsupp.UpdateEntityByIdCols(tmpCertItem.Id, &tmpCertItem, cols)
+
+			} else if tmpCertItem.InFlag == "2" && !strings.Contains(tmpCertItem.Remark, "资质过期")  {
+				tmpCertItem.InFlag = "2"
+				tmpCertItem.Remark = strings.Trim("资质过期," + tmpCertItem.Remark, ",")
+				svcsupp.UpdateEntityByIdCols(tmpCertItem.Id, &tmpCertItem, cols)
+			}
+		}
 	}
 
 	// 查询年审过期 和 资质都过期的
-	sqlYearCertLost := "update OilSupplierCert set Remark=CONCAT_WS(',', '年审过期', Remark) where Remark in ('资质过期', '不良记录', '资质过期,不良记录') AND InFlag = '2' AND ApplyTime <= '" + time.Now().AddDate(0, 0, -1).Format("2006-01-02") + "'"
+	sqlYearCertLost := "update OilSupplierCert set Remark=CONCAT_WS(',', '年审过期', Remark) where locate('年审过期', Remark) = 0 and locate('年检过期', Remark) = 0 AND InFlag = '2' AND ApplyTime <= '" + time.Now().Format("2006-01-02") + "'"
 	utils.DBE.Query(sqlYearCertLost)
 
 	// 查询年审过期的
-	sqlYearLost := "update OilSupplierCert set Remark='年审过期', InFlag = '2'  where InFlag = '1' AND ApplyTime <= '" + time.Now().AddDate(0, 0, -1).Format("2006-01-02") + "'"
+	sqlYearLost := "update OilSupplierCert set  Remark=CONCAT_WS(',', '年审过期', Remark), InFlag = '2'  where InFlag = '1' AND ApplyTime <= '" + time.Now().Format("2006-01-02") + "'"
 	utils.DBE.Query(sqlYearLost)
+
+	// 将过期时间的更正过来，SQL备份
+	/*
+	-- SELECT id, cert.SupplierId, Inflag, Remark FROM OilSupplierCert cert
+	UPDATE OilSupplierCert cert SET cert.InFlag='1', cert.Remark=''
+	WHERE cert.InFlag='2' AND cert.Remark = '资质过期'
+	AND NOT EXISTS (
+		SELECT Id, `NeedFileType`, a.EffectDate FROM `OilSupplierFile` a
+	WHERE a.EffectDate <= NOW()
+	AND a.SupplierTypeCode IN ('000', cert.SupplierTypeCode)
+	AND a.SupplierId = cert.SupplierId
+	) */
+
 }
 
 // @Title 更新Inflag状态

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -48,7 +48,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 20, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 20, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount">
       </el-pagination>
     </el-card>
@@ -112,7 +112,7 @@
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
       <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange" :current-page="CurrentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
         :total="CurrentItemCount">
       </el-pagination>
 

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -100,7 +100,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 50, 100, 200, 400]"
+                     :page-sizes="[10, 50, 100, 200, 500]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">

src/dashoo.cn/frontend_web/src/components/oilsupplier/techlist.vue

@@ -41,7 +41,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/documentmanage/files.vue

@@ -73,7 +73,7 @@
             <el-table-column prop="Remark" label="备注" align="center" min-width="60px" header-align="center" show-overflow-tooltip></el-table-column>
           </el-table>
           <el-pagination style="float:right;margin:10px 0 10px 0;" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-size="size" :page-sizes="[10, 15, 20 ]" layout="total, sizes, prev, pager, next, jumper"
+            :current-page="currentPage" :page-size="size" :page-sizes="[10, 20, 50, 100, 200]" layout="total, sizes, prev, pager, next, jumper"
             :total="currentItemCount">
           </el-pagination>
         </el-col>

src/dashoo.cn/frontend_web/src/pages/documentmanage/notice.vue

@@ -73,7 +73,7 @@
             <el-table-column prop="Remark" label="备注" align="center" min-width="60px" header-align="center" show-overflow-tooltip></el-table-column>
           </el-table>
           <el-pagination style="float:right;margin:10px 0 10px 0;" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-size="size" :page-sizes="[10, 15, 20 ]" layout="total, sizes, prev, pager, next, jumper"
+            :current-page="currentPage" :page-size="size" :page-sizes="[10, 50, 100, 200]" layout="total, sizes, prev, pager, next, jumper"
             :total="currentItemCount">
           </el-pagination>
         </el-col>

src/dashoo.cn/frontend_web/src/pages/oilbank/icbclist.vue

@@ -51,7 +51,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/_opera/baselist.vue

@@ -26,7 +26,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/_opera/evaluationlist.vue

@@ -39,7 +39,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/index.vue

@@ -161,7 +161,7 @@
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/baselist.vue

@@ -26,7 +26,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/evaluationlist.vue

@@ -39,7 +39,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/index.vue

@@ -70,7 +70,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/_opera/baselist.vue

@@ -25,7 +25,7 @@
       </el-table-column>
     </el-table>
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/_opera/evaluationlist.vue

@@ -72,7 +72,7 @@
     </div> -->
 
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
 
     <el-dialog

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year/index.vue

@@ -105,7 +105,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/_opera/baselist.vue

@@ -26,7 +26,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/index.vue

@@ -118,7 +118,7 @@
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">
       </el-pagination>
     </el-card>
@@ -315,7 +315,7 @@ export default {
   data() {
     return {
       tableLoading:false,
-      
+
       userSelectBoolean: false,
       eveIdList: 0,
       selectAllButtonBoolean: false,

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/baselist.vue

@@ -25,7 +25,7 @@
       </el-table-column>
     </el-table>
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/evaluationlist.vue

@@ -72,7 +72,7 @@
     </div> -->
 
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
 
     <el-dialog

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/index.vue

@@ -55,7 +55,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index_old.vue

@@ -69,7 +69,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/_opera/baselist.vue

@@ -26,7 +26,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/_opera/evaluationlist.vue

@@ -39,7 +39,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/index.vue

@@ -131,7 +131,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/_opera/baselist.vue

@@ -25,7 +25,7 @@
       </el-table-column>
     </el-table>
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/_opera/evaluationlist.vue

@@ -72,7 +72,7 @@
     </div> -->
 
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
 
     <el-dialog

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/index.vue

@@ -53,7 +53,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index_old.vue

@@ -69,7 +69,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-work-order/_opera/baselist.vue

@@ -26,7 +26,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-work-order/_opera/evaluationlist.vue

@@ -39,7 +39,7 @@
       </el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/baselist.vue

@@ -72,7 +72,7 @@
 
 
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilcontract/evaluation-items/evaluationlist.vue

@@ -74,7 +74,7 @@
     </div> -->
 
     <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                   :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                   :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
     </el-pagination> -->
 
     <el-dialog

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/basislist.vue

@@ -60,7 +60,7 @@
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/goodslist.vue

@@ -60,7 +60,7 @@
 
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -85,7 +85,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -112,7 +112,7 @@
           </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -112,7 +112,7 @@
           </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -112,7 +112,7 @@
           </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -111,7 +111,7 @@
           </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/_opera/operation.vue

@@ -62,7 +62,7 @@
         <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
       </el-table>
       <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange" :current-page="CurrentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
         :total="CurrentItemCount">
       </el-pagination>
       <div slot="footer" class="dialog-footer">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/_opera/showdelcertsub.vue

@@ -96,7 +96,7 @@
       </el-table>
 
       <!-- 分页 -->
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 50, 100, 200, 500]" :page-size="size"
         layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount"></el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/basisbuild/index.vue

@@ -82,7 +82,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -161,7 +161,7 @@
                          @current-change="handleCurrentChange"
                          :current-page="currentPage"
                          :page-size="size"
-                         :page-sizes="[10, 15, 20 ]"
+                         :page-sizes="[10, 50, 100, 200, 500]"
                          layout="total, sizes, prev, pager, next, jumper"
                          :total="currentItemCount">
           </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -379,7 +379,7 @@
           </el-table-column>-->
         </el-table>
         <el-pagination @size-change="importhandleSizeChange" @current-change="importhandleCurrentChange" :current-page="importcurrentPage"
-                       :page-sizes="[10, 50, 100, 200, 400]" :page-size="importsize" layout="total, sizes, prev, pager, next, jumper"
+                       :page-sizes="[10, 50, 100, 200, 500]" :page-size="importsize" layout="total, sizes, prev, pager, next, jumper"
                        :total="importcurrentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -81,7 +81,7 @@
           </el-table-column>
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/infoaudit.vue

@@ -68,7 +68,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount">
       </el-pagination>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentselect/index.vue

@@ -78,7 +78,7 @@
           </el-table>
 
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -29,6 +29,7 @@
           <el-form-item label="时间">
             <el-date-picker size="mini"
                             style="width: 220px"
+                            clearable
                             v-model="CreateOn"
                             type="daterange"
                             range-separator="至"
@@ -167,7 +168,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]"
+                     :page-sizes="[10, 50, 100, 200, 500]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -29,6 +29,7 @@
           <el-form-item label="时间">
             <el-date-picker size="mini"
                             style="width: 220px"
+                            clearable
                             v-model="CreateOn"
                             type="daterange"
                             range-separator="至"
@@ -165,7 +166,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]"
+                     :page-sizes="[10, 50, 100, 200, 500]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -16,7 +16,7 @@
         <!--</span>-->
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入类型">
@@ -109,7 +109,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -28,6 +28,7 @@
                  style="float: right; margin-top: -10px">
           <el-form-item label="时间">
             <el-date-picker size="mini"
+                            clearable
                             style="width: 220px"
                             v-model="CreateOn"
                             type="daterange"
@@ -167,7 +168,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]"
+                     :page-sizes="[10, 50, 100, 200, 500]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -108,7 +108,7 @@
 
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -108,7 +108,7 @@
 
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/index.vue

@@ -112,7 +112,7 @@
 
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                       :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                       :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                        :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -110,7 +110,7 @@
 
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
           :total="currentItemCount">
         </el-pagination>
       </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -703,7 +703,7 @@
             this.shenheForm.AuditorRemark = ''
           }
         } else {
-          if (this.shenheForm.SuccessStatus === 1){
+          if (this.shenheForm.SuccessStatus === 1) {
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
           } else {
             this.textplaceholder = '退回意见不能少于5个字'
@@ -1391,7 +1391,7 @@
               return
             }
           }
-          if (this.auditform.AuditRemark.trim().length < 1) {
+          /* if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
@@ -1404,7 +1404,7 @@
               message: '审批意见不能低于20个字符！'
             })
             return false
-          }
+          } */
         } else {
           this.auditform.AuditRemark = this.backRemark
           if (this.auditform.AuditRemark.trim().length < 1) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -1130,7 +1130,7 @@
               return
             }
           }
-          if (this.auditform.AuditRemark.trim().length < 1) {
+          /* if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
@@ -1143,7 +1143,7 @@
               message: '审批意见不能低于20个字符！'
             })
             return false
-          }
+          } */
         } else {
           this.auditform.AuditRemark = this.backRemark
           if (this.auditform.AuditRemark.trim().length < 1) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -1088,7 +1088,7 @@
               return
             }
           }
-          if (this.auditform.AuditRemark.trim().length < 1) {
+          /* if (this.auditform.AuditRemark.trim().length < 1) {
             this.$message({
               type: 'warning',
               message: '请填写审批意见！'
@@ -1101,7 +1101,7 @@
               message: '审批意见不能低于20个字符！'
             })
             return false
-          }
+          } */
         } else {
           this.auditform.AuditRemark = this.backRemark
           if (this.auditform.AuditRemark.trim().length < 1) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/basislist.vue

@@ -12,10 +12,10 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -73,7 +73,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/goodslist.vue

@@ -12,10 +12,10 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -71,7 +71,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -12,10 +12,10 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入类型">
@@ -89,7 +89,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/techlist.vue

@@ -12,10 +12,10 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -74,7 +74,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/basislist.vue

@@ -11,10 +11,10 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -62,7 +62,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/goodslist.vue

@@ -11,10 +11,10 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -62,7 +62,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/index.vue

@@ -12,10 +12,10 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入类型">
@@ -73,7 +73,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/techlist.vue

@@ -11,10 +11,10 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
 
@@ -62,7 +62,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -200,10 +200,10 @@
     <el-dialog title="修改有效期" :visible.sync="dialogApplyTime" width="655px">
       <el-dialog
         width="40%"
-        title="内层 Dialog"
+        title="修改记录"
         :visible.sync="innerVisible"
         append-to-body>
-        <el-table :data="historyDatas">
+        <el-table :data="historyDatas" size="mini">
           <el-table-column property="BeforeDate" label="修改日期" width="150"></el-table-column>
           <el-table-column property="BeforeDate" label="修改前" width="150"></el-table-column>
           <el-table-column property="AfterDate" label="修改后" width="200"></el-table-column>
@@ -238,7 +238,7 @@
                     style="width: 100%">
           </el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="text-align: center">
           <el-button type="primary" size="mini" style="display:block;margin:0 auto" @click="saveApplyTime">保存</el-button>
           <el-button type="primary" size="mini"  @click="saveinnerVisible">修改记录</el-button>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -203,10 +203,10 @@
     <el-dialog title="修改有效期" :visible.sync="dialogApplyTime" width="655px">
       <el-dialog
         width="40%"
-        title="内层 Dialog"
+        title="修改记录"
         :visible.sync="innerVisible"
         append-to-body>
-        <el-table :data="historyDatas">
+        <el-table :data="historyDatas" size="mini">
           <el-table-column property="BeforeDate" label="修改日期" width="150"></el-table-column>
           <el-table-column property="BeforeDate" label="修改前" width="150"></el-table-column>
           <el-table-column property="AfterDate" label="修改后" width="200"></el-table-column>
@@ -241,7 +241,7 @@
                     style="width: 100%">
           </el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="text-align: center">
           <el-button type="primary" size="mini"  @click="saveApplyTime">保存</el-button>
           <el-button type="primary" plain size="mini"  @click="saveinnerVisible">查看修改记录</el-button>
         </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -203,10 +203,10 @@
     <el-dialog title="修改有效期" :visible.sync="dialogApplyTime" width="655px">
       <el-dialog
         width="40%"
-        title="内层 Dialog"
+        title="修改记录"
         :visible.sync="innerVisible"
         append-to-body>
-        <el-table :data="historyDatas">
+        <el-table :data="historyDatas" size="mini">
           <el-table-column property="BeforeDate" label="修改日期" width="150"></el-table-column>
           <el-table-column property="BeforeDate" label="修改前" width="150"></el-table-column>
           <el-table-column property="AfterDate" label="修改后" width="200"></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -11,13 +11,13 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入标识">
@@ -87,7 +87,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -11,13 +11,13 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入标识">
@@ -88,7 +88,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/index.vue

@@ -12,13 +12,13 @@
 
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入类型">
@@ -85,7 +85,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
         <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/techlist.vue

@@ -11,13 +11,13 @@
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="准入编码">
-            <el-input size="mini" v-model="searchForm.Code" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.Code" style="width:100%" clearable placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" v-model="searchForm.SupplierName" clearable style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" clearable type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           <el-form-item label="准入标识">
@@ -87,7 +87,7 @@
         </el-table-column>-->
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                     :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/select/badrecordselect/index.vue

@@ -223,7 +223,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]"
+                     :page-sizes="[10, 50, 100, 200, 500]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount"></el-pagination>

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -167,7 +167,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]"
+        :page-sizes="[10, 50, 100, 200, 500]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount"

src/dashoo.cn/frontend_web/src/pages/select/components/subfilelist.vue

@@ -49,7 +49,7 @@
       <el-pagination @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
-                     :page-sizes="[10, 15, 20, 25]"
+                     :page-sizes="[10, 50, 100, 200]"
                      :page-size="size"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="currentItemCount"></el-pagination>

src/dashoo.cn/frontend_web/src/pages/select/informationreporting/index.vue

@@ -78,7 +78,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]"
+        :page-sizes="[10, 50, 100, 200, 500]"
         :page-size="size"
         layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount"

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -92,7 +92,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChangeAll" @current-change="handleCurrentChangeAll" :current-page="currentPage"
-                         :page-sizes="[40, 80, 160]" :page-size="sizeAll" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="sizeAll" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="准入" name="first">
@@ -134,7 +134,7 @@
             </el-table-column>
           </el-table>
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+                         :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
           </el-pagination>
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">

src/dashoo.cn/frontend_web/src/pages/select/usednameselect/index.vue

@@ -51,7 +51,7 @@
 
       <!-- 分页 -->
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
         :total="currentItemCount"></el-pagination>
     </el-card>
   </div>