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

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

@@ -45,6 +45,7 @@ func (this *OilCatalogController) GetEntityList() {
 	catalogType := this.GetString("CatalogType")
 	Status := this.GetString("Status")
 	CreateOn := this.GetString("CreateOn")
+	Year := this.GetString("Year")
 
 	if SubId != "" {
 		where = where + " and SubId=" + SubId
@@ -64,6 +65,10 @@ func (this *OilCatalogController) GetEntityList() {
 		where = where + " and Status = '" + Status + "'"
 	}
 
+	if Year != "" {
+		where = where + " and CreateOn >= '" + Year + "-01-01 00:00:00' and CreateOn <='" + Year + "-12-31 00:00:00'"
+	}
+
 	if CreateOn != "" {
 		dates := strings.Split(CreateOn, ",")
 		if len(dates) == 2 {

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

@@ -31,12 +31,12 @@ func (this *OilCatalogSubController) GetEntityList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
-	orderby := "Id"
+	orderBy := "Id"
 	asc := false
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
-		orderby = Prop
+		orderBy = Prop
 		if Order == "asc" {
 			asc = true
 		}
@@ -104,8 +104,10 @@ func (this *OilCatalogSubController) GetEntityList() {
 		where = where + " and ProcessKey = '" + ProcessKey + "'"
 	}
 
-	if CreateUserId != "" {
+	if CreateUserId == "" {
 		where = where + " and CreateUserId =" + this.User.Id
+	} else {
+		where = where + " and CreateUserId =" + CreateUserId
 	}
 
 	if CreateBy != "" {
@@ -144,13 +146,13 @@ func (this *OilCatalogSubController) GetEntityList() {
 
 	svc := oilcatalogsub.GetOilCatalogSubService(utils.DBE)
 	var list []oilcatalogsub.OilCatalogSub
-	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
-	var datainfo DataInfo
-	datainfo.Items = list
-	datainfo.CurrentItemCount = total
-	datainfo.PageIndex = page.CurrentPage
-	datainfo.ItemsPerPage = page.Size
-	this.Data["json"] = &datainfo
+	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderBy, asc, &list, where)
+	var dataInfo DataInfo
+	dataInfo.Items = list
+	dataInfo.CurrentItemCount = total
+	dataInfo.PageIndex = page.CurrentPage
+	dataInfo.ItemsPerPage = page.Size
+	this.Data["json"] = &dataInfo
 	this.ServeJSON()
 }
 
@@ -356,7 +358,6 @@ func (this *OilCatalogSubController) DeleteEntityAndItems() {
 	where := "SubId=" + Id
 	svc.DeleteEntityBytbl(OilCatalogName, where)
 
-
 	err := svc.DeleteEntityById(Id, &model)
 
 	if err == nil {
@@ -383,13 +384,14 @@ func (this *OilCatalogSubController) CommitAuditEntity() {
 	svc := oilcatalogsub.GetOilCatalogSubService(utils.DBE)
 	svc.GetEntityById(Id, &entity)
 
-	var catalogsub oilcatalogsub.OilCatalogSub
+	var cataLogSub oilcatalogsub.OilCatalogSub
 	// 更新主表状态
-	cols := []string{"Status", "AuditIndex"}
-	catalogsub.Status = oilcatalogsub.FIRST_TRIAL_STATUS
-	catalogsub.AuditIndex = entity.AuditIndex + 1
+	cols := []string{"Status", "AuditIndex", "SubmitOn"}
+	cataLogSub.Status = oilcatalogsub.FIRST_TRIAL_STATUS
+	cataLogSub.AuditIndex = entity.AuditIndex + 1
+	cataLogSub.SubmitOn = time.Now()
 	where := "Id=" + Id
-	svc.UpdateEntityBywheretbl(OilCatalogSubName, &catalogsub, cols, where)
+	svc.UpdateEntityBywheretbl(OilCatalogSubName, &cataLogSub, cols, where)
 	//更新从表状态
 	var catalog oilcatalog.OilCatalog
 	cols = []string{"Status"}
@@ -400,7 +402,7 @@ func (this *OilCatalogSubController) CommitAuditEntity() {
 	//启动工作流
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	processInstanceId := ""
-	businessKey := Id + "-" + strconv.Itoa(catalogsub.AuditIndex)
+	businessKey := Id + "-" + strconv.Itoa(cataLogSub.AuditIndex)
 	processKey := workflow.OIL_Catalog
 	processInstanceId = svcActiviti.StartProcess2(processKey, businessKey, this.User.Id, "1", "", "")
 
@@ -416,35 +418,35 @@ func (this *OilCatalogSubController) CommitAuditEntity() {
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 	cols1 := []string{"WorkflowId", "BusinessKey", "ProcessKey"}
-	catalogsub.BusinessKey = businessKey
-	catalogsub.ProcessKey = processKey
-	catalogsub.WorkflowId = processInstanceId
-	wheresub := "Id=" + Id
-	svc.UpdateEntityBywheretbl(OilCatalogSubName, &catalogsub, cols1, wheresub)
-
-	var audithistoryentity audithistory.Base_AuditHistory
-	audithistoryentity.EntityId = entity.Id
-	audithistoryentity.WorkflowId = entity.WorkflowId
-	audithistoryentity.Process = ActiComplete.ProcessKey
-	audithistoryentity.BusinessKey = ActiComplete.BusinessKey
-	audithistoryentity.Type = ""
-	audithistoryentity.BackStep = entity.Status
-	audithistoryentity.Index = entity.AuditIndex
-	audithistoryentity.CreateOn = time.Now()
-	audithistoryentity.CreateBy = this.User.Realname
-	audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	svc.InsertEntity(audithistoryentity)
-
-	var errinfo ErrorInfo
+	cataLogSub.BusinessKey = businessKey
+	cataLogSub.ProcessKey = processKey
+	cataLogSub.WorkflowId = processInstanceId
+	whereSub := "Id=" + Id
+	svc.UpdateEntityBywheretbl(OilCatalogSubName, &cataLogSub, cols1, whereSub)
+
+	var auditHistoryEntity audithistory.Base_AuditHistory
+	auditHistoryEntity.EntityId = entity.Id
+	auditHistoryEntity.WorkflowId = entity.WorkflowId
+	auditHistoryEntity.Process = ActiComplete.ProcessKey
+	auditHistoryEntity.BusinessKey = ActiComplete.BusinessKey
+	auditHistoryEntity.Type = ""
+	auditHistoryEntity.BackStep = entity.Status
+	auditHistoryEntity.Index = entity.AuditIndex
+	auditHistoryEntity.CreateOn = time.Now()
+	auditHistoryEntity.CreateBy = this.User.Realname
+	auditHistoryEntity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	svc.InsertEntity(auditHistoryEntity)
+
+	var errInfo ErrorInfo
 	if receiveVal == "true" {
-		errinfo.Message = "提交成功！"
-		errinfo.Code = 0
-		this.Data["json"] = &errinfo
+		errInfo.Message = "提交成功！"
+		errInfo.Code = 0
+		this.Data["json"] = &errInfo
 		this.ServeJSON()
 	} else {
-		errinfo.Message = "工作流异常，请联系管理员！"
-		errinfo.Code = -1
-		this.Data["json"] = &errinfo
+		errInfo.Message = "工作流异常，请联系管理员！"
+		errInfo.Code = -1
+		this.Data["json"] = &errInfo
 		this.ServeJSON()
 		return
 	}
@@ -456,64 +458,64 @@ func (this *OilCatalogSubController) CommitAuditEntity() {
 // @Success	200	{object} controllers.Request
 // @router /auditentity/:id [post]
 func (this *OilCatalogSubController) AuditEntity() {
-	var dataother ShenHeModel
+	var dataOther ShenHeModel
 	Id := this.Ctx.Input.Param(":id")
 
 	var jsonblob = this.Ctx.Input.RequestBody
-	json.Unmarshal(jsonblob, &dataother)
+	json.Unmarshal(jsonblob, &dataOther)
 
 	var entity oilcatalogsub.OilCatalogSub
 	var catalog oilcatalog.OilCatalog
 	svc := oilcatalogsub.GetOilCatalogSubService(utils.DBE)
 	svc.GetEntityById(Id, &entity)
 
-	var errinfo ErrorDataInfo
+	var errInfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
 		if err := recover(); err != nil {
-			errinfo.Message = "提交失败，" + err.(string)
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
+			errInfo.Message = "提交失败，" + err.(string)
+			errInfo.Code = -1
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 		} else {
 			//返回正确结果
-			errinfo.Message = "审核提交成功"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
+			errInfo.Message = "审核提交成功"
+			errInfo.Code = 0
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 		}
 	}()
 
 	//remarks := ""
 	status := ""
-	backstatus := "0"
+	backStatus := "0"
 	var userIds string
 
 	if entity.Status == oilcatalogsub.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(entity.SecondAudit)
 		status = oilcatalogsub.SECOND_TRIAL_STATUS
-		backstatus = oilcatalogsub.NOPASS_STATUS
+		backStatus = oilcatalogsub.NOPASS_STATUS
 	} else if entity.Status == oilcatalogsub.SECOND_TRIAL_STATUS {
-		backstatus = oilcatalogsub.NO_SECOND_TRIAL_STATUS
+		backStatus = oilcatalogsub.NO_SECOND_TRIAL_STATUS
 		status = oilcatalogsub.CENT_AUDIT_STATUS
 
 		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-		topid := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
+		topId := paramSvc.GetBaseparameterMessage("", "paramset", "CENT_AUDIT")
 
-		var userlist []userRole.Base_User
+		var userList []userRole.Base_User
 		var setting auditsetting.Base_OilAuditSetting
-		usvc := userRole.GetUserService(utils.DBE)
+		uSvc := userRole.GetUserService(utils.DBE)
 		where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
-		usvc.GetEntity(&setting, where)
+		uSvc.GetEntity(&setting, where)
 
-		ids := usvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
-		tempstr := strings.Join(ids, ",")
-		uids := strings.Replace(tempstr, "uid_", "", -1)
+		ids := uSvc.GetUserIdsByRoleId(strconv.Itoa(setting.RoleId))
+		tempStr := strings.Join(ids, ",")
+		uids := strings.Replace(tempStr, "uid_", "", -1)
 		uids = strings.Trim(uids, ",")
 		if uids != "" {
-			where := "Id in (" + uids + ")" + " and UnitId=" + topid
-			usvc.GetEntities(&userlist, where)
+			where := "Id in (" + uids + ")" + " and UnitId=" + topId
+			uSvc.GetEntities(&userList, where)
 		}
-		for _, tmpUser := range userlist {
+		for _, tmpUser := range userList {
 			userIds += strconv.Itoa(tmpUser.Id) + ","
 		}
 
@@ -522,7 +524,7 @@ func (this *OilCatalogSubController) AuditEntity() {
 	} else if entity.Status == oilcatalogsub.CENT_AUDIT_STATUS {
 		userIds = this.User.Id
 		status = oilcatalogsub.ALL_PASE_STATUS
-		backstatus = oilcatalogsub.NO_CENT_AUDIT_STATUS
+		backStatus = oilcatalogsub.NO_CENT_AUDIT_STATUS
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
@@ -531,9 +533,9 @@ func (this *OilCatalogSubController) AuditEntity() {
 	ActiComplete.BusinessKey = entity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
-	ActiComplete.Remarks = dataother.AuditorRemark
+	ActiComplete.Remarks = dataOther.AuditorRemark
 	ActiComplete.CallbackUrl = ""
-	if dataother.SuccessStatus == 1 {
+	if dataOther.SuccessStatus == 1 {
 		ActiComplete.Result = "1"
 
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -555,14 +557,14 @@ func (this *OilCatalogSubController) AuditEntity() {
 
 			where := "SubId=" + Id + " and CatalogType=" + entity.Type
 			svc.UpdateEntityBywheretbl(OilCatalogName, &catalog, cols, where)
-			errinfo.Message = "提交成功！"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
+			errInfo.Message = "提交成功！"
+			errInfo.Code = 0
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 		} else {
-			errinfo.Message = "工作流异常，请联系管理员！"
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
+			errInfo.Message = "工作流异常，请联系管理员！"
+			errInfo.Code = -1
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 			return
 		}
@@ -573,7 +575,7 @@ func (this *OilCatalogSubController) AuditEntity() {
 
 		if receiveVal == "true" {
 			// 更新主表状态
-			entity.Status = backstatus
+			entity.Status = backStatus
 			cols := []string{
 				"Status",
 			}
@@ -582,16 +584,16 @@ func (this *OilCatalogSubController) AuditEntity() {
 			catalog.Status = "0"
 			where := "SubId=" + Id + " and CatalogType=" + entity.Type
 			svc.UpdateEntityBywheretbl(OilCatalogName, &catalog, cols, where)
-			errinfo.Message = "提交成功！"
-			errinfo.Code = 0
-			this.Data["json"] = &errinfo
+			errInfo.Message = "提交成功！"
+			errInfo.Code = 0
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 		} else {
-			errinfo.Message = "工作流异常，请联系管理员！"
-			errinfo.Code = -1
-			this.Data["json"] = &errinfo
+			errInfo.Message = "工作流异常，请联系管理员！"
+			errInfo.Code = -1
+			this.Data["json"] = &errInfo
 			this.ServeJSON()
 			return
 		}
 	}
-}
+}

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

@@ -119,6 +119,20 @@ func (this *OilSupplierCertAppendListenerController) PreThirdTrialStatus() {
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	certSrv.GetEntityById(supplierCertAppendId, &supplierCertAppendEntity)
+
+	//查出业务处室接收分办的人员
+	stepCode := workflow.PROF_RECE //专业处室接收
+	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
+	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, strconv.Itoa(supplierCertAppendEntity.ThirdAudit))
+	var approveInfo ListenerApproveInfo
+	approveInfo.Users = approverIds
+
+	if approverIds == "" {
+		this.Data["json"] = ""
+		this.ServeJSON()
+		return
+	}
+
 	cols := []string{
 		"Id",
 		"Status",
@@ -127,12 +141,6 @@ func (this *OilSupplierCertAppendListenerController) PreThirdTrialStatus() {
 	supplierCertAppendEntity.Status = suppliercert.THIRD_TRIAL_STATUS ////专业处接收
 	certSrv.UpdateEntityByIdCols(supplierCertAppendId, supplierCertAppendEntity, cols)
 
-	//查出业务处室接收分办的人员
-	stepCode := workflow.PROF_RECE //专业处室接收
-	auditSettingService := auditsetting.GetOilAuditSettingService(utils.DBE)
-	approverIds := auditSettingService.GetApproverIdsByStepCodeAndUnitId(stepCode, strconv.Itoa(supplierCertAppendEntity.ThirdAudit))
-	var approveInfo ListenerApproveInfo
-	approveInfo.Users = approverIds
 	this.Data["json"] = &approveInfo
 	this.ServeJSON()
 }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -15,20 +15,17 @@
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:120px" placeholder="企业名称"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" clearable v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" style="width:120px" placeholder="业务范围"></el-input>
+          </el-form-item>
+          <el-form-item label="申请年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="申请年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
           </el-form-item>
-          <!--<el-form-item label="准入类型">-->
-            <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
-              <!--<el-option label="全部" value=""></el-option>-->
-              <!--<el-option label="物资类" value="物资类"></el-option>-->
-              <!--<el-option label="基建类" value="基建类"></el-option>-->
-              <!--<el-option label="服务类" value="服务类"></el-option>-->
-            <!--</el-select>-->
-          <!--</el-form-item>-->
-
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -38,9 +35,9 @@
             </el-dropdown>
           </el-form-item>
           <el-form-item>
-            <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit?type='+formData.CatalogType">
-              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7' || formData.CatalogType == '6'">申请</el-button>
-            </router-link>
+            <!--<router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit?type='+formData.CatalogType">-->
+            <!--  <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7' || formData.CatalogType == '6'">申请</el-button>-->
+            <!--</router-link>-->
             &nbsp;
             <el-button type="primary" size="mini" @click="addOilCataLog" v-if="showBtn">添加</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
@@ -55,19 +52,23 @@
             <el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" @click="deleteClick(scope.row)" plain :disabled="!showBtn">删除</el-button>
           </template>
         </el-table-column>
-        <el-table-column type="index" width="50" align="center" />
+        <el-table-column label="序号" align="center" min-width="70">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column sortable min-width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" prop="ValidityTo" label="有效期至">
+        <el-table-column sortable width="100" align="center" prop="ValidityTo" label="有效期至">
           <template slot-scope="scope">
-            {{(jsTimeHandle(scope.row.ValidityTo))}}
+            {{(jsTimeHandleForInCome(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="LegalPerson" label="法人姓名"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="IDCode" label="法人身份证号"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>-->
         <el-table-column sortable min-width="150" align="center" show-overflow-tooltip prop="USCCode" label="全国统一信用代码"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>-->
         <el-table-column sortable width="120" align="center" :key="Math.random()" v-if="formData.CatalogType == 6 || formData.CatalogType == 7" show-overflow-tooltip prop="Dept" label="申报单位"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
 
@@ -83,32 +84,32 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="企业名称" prop="CompanyName">
-              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="企业名称" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="法人姓名" prop="LegalPerson">
-              <el-input v-model="formData.LegalPerson" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.LegalPerson" :maxlength="255" placeholder="法人姓名" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="法人身份证号" prop="IDCode">
-              <el-input v-model="formData.IDCode" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.IDCode" :maxlength="255" placeholder="法人身份证号" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册地址" prop="Address">
-              <el-input v-model="formData.Address" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.Address" :maxlength="255" placeholder="注册地址" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="全国统一信用代码" prop="USCCode">
-              <el-input v-model="formData.USCCode" :maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.USCCode" :maxlength="255" placeholder="全国统一信用代码" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册资金" prop="RegCapital">
-              <el-input type="number" v-model.number="formData.RegCapital" :min="1" placeholder="请输入" style="width: 100%">
+              <el-input type="number" v-model.number="formData.RegCapital" :min="1" placeholder="注册资金" style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
@@ -130,13 +131,13 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="formData.Remark"  placeholder="请输入" type="textarea" style="width: 100%">
+              <el-input v-model="formData.Remark"  placeholder="备注" type="textarea" style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item style="text-align: center;"  v-if="showBtn">
-              <el-button type="primary" size="mini" @click="saveOilcatalog">保存</el-button>
+              <el-button type="primary" size="mini" @click="saveOilCataLog">保存</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -214,6 +215,7 @@
       }
 
       return {
+        yearList: [],
         uploadshow: false,
         tableLoading: false,
         btnName: '打开',
@@ -264,13 +266,13 @@
             { required: true, validator: checkLegalPersonId, trigger: 'change' }
           ],
           Address: [
-            { required: true, message: '注册地址不能为空', trigger: 'blur' }
+            { required: false, message: '注册地址不能为空', trigger: 'blur' }
           ],
           USCCode: [
-            { required: true, validator: checkCommercialNo, trigger: 'change' }
+            { required: false, validator: checkCommercialNo, trigger: 'change' }
           ],
           RegCapital: [
-            { required: true, validator: checkMoney, trigger: 'change' },
+            { required: false, validator: checkMoney, trigger: 'change' },
             { type: 'number', message: '只能输入数字', trigger: 'blur' }
           ],
           RecordScope: [
@@ -318,10 +320,16 @@
         this.cardTitle = '收入业务'
       }
       this.isAccess()
+      this.getYearList()
       this.initDatas()
     },
 
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'
@@ -438,6 +446,7 @@
         this.formData.USCCode = ''
         this.formData.RegCapital = ''
         this.formData.Dept = ''
+        this.formData.DutyDept = ''
         this.formData.Remark = ''
         this.formData.ValidityTo = null
       },
@@ -456,17 +465,11 @@
         this.formData.Business = val.Business
         this.formData.ProcessKey = val.ProcessKey
         this.formData.Dept = val.Dept
+        this.formData.DutyDept = val.DutyDept
         this.formData.Status = val.Status
-        this.ValidityDate = [new Date(val.ValidityFrom), new Date(val.ValidityTo)]
+        this.formData.ValidityTo = val.ValidityTo
       },
-      saveOilcatalog () {
-        if (this.ValidityDate && this.ValidityDate.length === 2) {
-          this.ValidityDate[1].setHours(23)
-          this.ValidityDate[1].setMinutes(59)
-          this.ValidityDate[1].setSeconds(59)
-          this.formData.ValidityFrom = this.ValidityDate[0]
-          this.formData.ValidityTo = this.ValidityDate[1]
-        }
+      saveOilCataLog () {
         if (this.formData.Id > 0) {
           this.editEntity()
         } else {
@@ -545,19 +548,27 @@
           this.tableLoading = false
         })
       },
-      jsTimeHandle (val) {
-        console.log('时间', val)
-        if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
-        } else if (val === '0001-01-01T00:00:00Z') {
-          return '----'
-        } else if (val === '5000-01-01T23:59:59+08:00') {
-          return '永久'
+      jsTimeHandleForInCome (val) {
+        if (this.formData.CatalogType == '7') {
+          // 收入业务无有效期，设置为当前时间的后五年
+          let now = new Date()
+          let year = now.getFullYear() + 4
+          return year + '-12-31'
+        } else if (this.formData.CatalogType == '6') {
+          if (val === '') {
+            return '----'
+          } else if (val === '0001-01-01T08:00:00+08:00') {
+            return '----'
+          } else if (val === '0001-01-01T00:00:00Z') {
+            return '----'
+          } else if (val === '5000-01-01T23:59:59+08:00') {
+            return '永久'
+          } else {
+            val = val.replace('T', ' ')
+            return val.substring(0, 10)
+          }
         } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
+          return '----'
         }
       },
       searchCommand (command) {
@@ -621,38 +632,6 @@
             })
           })
       },
-      deleteEntity (row) {
-        api.deleteEntity(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      jstimehandle (val) {
-        if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
-        } else if (val === '5000-01-01T23:59:59+08:00') {
-          return '永久'
-        } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
-        }
-      },
-
       formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1

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

@@ -15,19 +15,17 @@
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:120px" placeholder="企业名称"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" clearable v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" style="width:120px" placeholder="业务范围"></el-input>
+          </el-form-item>
+          <el-form-item label="申请年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="申请年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
           </el-form-item>
-          <!--<el-form-item label="准入类型">-->
-            <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
-              <!--<el-option label="全部" value=""></el-option>-->
-              <!--<el-option label="物资类" value="物资类"></el-option>-->
-              <!--<el-option label="基建类" value="基建类"></el-option>-->
-              <!--<el-option label="服务类" value="服务类"></el-option>-->
-            <!--</el-select>-->
-          <!--</el-form-item>-->
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -56,10 +54,14 @@
           </template>
 
         </el-table-column>
-        <el-table-column type="index" width="50" align="center" />
+        <el-table-column label="序号" align="center" width="70">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column sortable width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable width="125" align="center" show-overflow-tooltip label="有效期至">
+        <el-table-column sortable width="100" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
             {{(jsTimeHandle(scope.row.ValidityTo))}}
           </template>
@@ -80,7 +82,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="供方名称" prop="CompanyName" :rules="{ required: true, message: '供方名称不能为空', trigger: 'blur'}">
-              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%" :readonly="!showBtn"></el-input>
+              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="供方名称" style="width: 100%" :readonly="!showBtn"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -105,7 +107,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="formData.Remark"  placeholder="请输入" type="textarea" style="width: 100%" :readonly="!showBtn">
+              <el-input v-model="formData.Remark"  placeholder="备注" type="textarea" style="width: 100%" :readonly="!showBtn">
               </el-input>
             </el-form-item>
           </el-col>
@@ -153,15 +155,8 @@
     name: 'oilcatalog',
 
     data () {
-      var validDate = (rule, value, callback) => {
-        if (!value || !value[0] || !value[1]) {
-          callback(new Error('请选择时间'))
-        } else {
-          callback()
-        }
-      }
-
       return {
+        yearList: [],
         tableLoading: false,
         Excelurl: '',
         btnName: '打开',
@@ -248,10 +243,16 @@
       } else if (this.$route.query.catalogType === '6') {
         this.cardTitle = '外部市场'
       }
+      this.getYearList()
       this.initDatas()
     },
 
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       // excel导入
       importExcel () {
         this.uploadshow = true
@@ -523,25 +524,6 @@
             })
           })
       },
-      deleteEntity (row) {
-        api.deleteEntity(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
       jsTimeHandle (val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogselect/income.vue

@@ -15,20 +15,17 @@
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:120px" placeholder="企业名称"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" clearable v-model="searchForm.Business" :autosize="{ minRows: 3}" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" :autosize="{ minRows: 3}" style="width:120px" placeholder="业务范围"></el-input>
+          </el-form-item>
+          <el-form-item label="申请年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="申请年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
           </el-form-item>
-          <!--<el-form-item label="准入类型">-->
-            <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
-              <!--<el-option label="全部" value=""></el-option>-->
-              <!--<el-option label="物资类" value="物资类"></el-option>-->
-              <!--<el-option label="基建类" value="基建类"></el-option>-->
-              <!--<el-option label="服务类" value="服务类"></el-option>-->
-            <!--</el-select>-->
-          <!--</el-form-item>-->
-
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -42,25 +39,29 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" border stripe height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" size="mini" v-loading="tableLoading" :header-cell-style="{'text-align': 'center'}">
+      <el-table :data="entityList" border stripe height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderBy" size="mini" v-loading="tableLoading" :header-cell-style="{'text-align': 'center'}">
         <el-table-column label="操作" min-width="100px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="editOilcatalog(scope.row)" plain>查看</el-button>
+            <el-button type="primary" size="mini" @click="editOilCataLog(scope.row)" plain>查看</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="序号" align="center" min-width="70">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
           </template>
         </el-table-column>
-        <el-table-column type="index" width="50" align="center" />
         <el-table-column sortable min-width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" prop="ValidityTo" label="有效期至">
+        <el-table-column sortable min-width="100" align="center" prop="ValidityTo" label="有效期至">
           <template slot-scope="scope">
-            {{(jsTimeHandle(scope.row.ValidityTo))}}
+            {{(jsTimeHandleForInCome(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="LegalPerson" label="法人姓名"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="IDCode" label="法人身份证号"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>-->
         <el-table-column sortable min-width="150" align="center" show-overflow-tooltip prop="USCCode" label="全国统一信用代码"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>
+        <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>-->
         <el-table-column sortable width="120" align="center" :key="Math.random()" v-if="formData.CatalogType == 6 || formData.CatalogType == 7" show-overflow-tooltip prop="Dept" label="申报单位"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
 
@@ -70,7 +71,7 @@
       </el-pagination>
     </el-card>
     <el-dialog :title="cardTitle"
-               :visible.sync="addshow"
+               :visible.sync="addShow"
                width="60%">
       <el-form label-width="135px" ref="EntityForm" :model="formData">
         <el-row>
@@ -129,7 +130,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item style="text-align: center;"  v-if="showBtn">
-              <el-button type="primary" size="small" @click="addshow = false">关闭</el-button>
+              <el-button type="primary" size="small" @click="addShow = false">关闭</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -152,13 +153,14 @@
 
     data () {
       return {
+        yearList: [],
         tableLoading: false,
         btnName: '打开',
         showBtn: false,
         cardTitle: '收入业务',
         catalogType: '',
         addShowTitle: '查看目录',
-        addshow: false,
+        addShow: false,
         loading: false,
 
         // 分页参数
@@ -225,10 +227,16 @@
         this.cardTitle = '收入业务'
       }
       this.isAccess()
+      this.getYearList()
       this.initDatas()
     },
 
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'
@@ -268,8 +276,8 @@
           }
         })
       },
-      editOilcatalog (val) {
-        this.addshow = true
+      editOilCataLog (val) {
+        this.addShow = true
         this.formData.Id = val.Id
         this.formData.SubId = val.SubId
         this.formData.CatalogType = val.CatalogType
@@ -327,7 +335,7 @@
         }
       },
       // 列表排序功能
-      orderby (column) {
+      orderBy (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -355,38 +363,27 @@
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity (row) {
-        api.deleteEntity(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
+      jsTimeHandleForInCome (val) {
+        if (this.formData.CatalogType == '7') {
+          // 收入业务无有效期，设置为当前时间的后五年
+          let now = new Date()
+          let year = now.getFullYear() + 4
+          return year + '-12-31'
+        } else if (this.formData.CatalogType == '6') {
+          if (val === '') {
+            return '----'
+          } else if (val === '0001-01-01T08:00:00+08:00') {
+            return '----'
+          } else if (val === '0001-01-01T00:00:00Z') {
+            return '----'
+          } else if (val === '5000-01-01T23:59:59+08:00') {
+            return '永久'
           } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
+            val = val.replace('T', ' ')
+            return val.substring(0, 10)
           }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      jsTimeHandle (val) {
-        console.log('时间', val)
-        if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
-        } else if (val === '0001-01-01T00:00:00Z') {
-          return '----'
-        } else if (val === '5000-01-01T23:59:59+08:00') {
-          return '永久'
         } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
+          return '----'
         }
       },
 

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

@@ -15,20 +15,17 @@
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
           <el-form-item label="企业名称">
-            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.CompanyName" style="width:120px" placeholder="企业名称"></el-input>
           </el-form-item>
           <el-form-item label="业务范围">
-            <el-input size="mini" clearable v-model="searchForm.Business" style="width:100%" placeholder="请输入"></el-input>
+            <el-input size="mini" clearable v-model="searchForm.Business" style="width:120px" placeholder="业务范围"></el-input>
+          </el-form-item>
+          <el-form-item label="申请年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="申请年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
           </el-form-item>
-          <!--<el-form-item label="准入类型">-->
-          <!--<el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">-->
-          <!--<el-option label="全部" value=""></el-option>-->
-          <!--<el-option label="物资类" value="物资类"></el-option>-->
-          <!--<el-option label="基建类" value="基建类"></el-option>-->
-          <!--<el-option label="服务类" value="服务类"></el-option>-->
-          <!--</el-select>-->
-          <!--</el-form-item>-->
-
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -46,14 +43,18 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" border highlight-current-row stripe height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby" size="mini" v-loading="tableLoading" :header-cell-style="{'text-align':'center'}">
+      <el-table :data="entityList" border highlight-current-row stripe height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderBy" size="mini" v-loading="tableLoading" :header-cell-style="{'text-align':'center'}">
         <el-table-column label="操作" min-width="60px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" @click="editOilCataLog(scope.row)" plain>查看</el-button>
           </template>
 
         </el-table-column>
-        <el-table-column type="index" width="50" align="center" />
+        <el-table-column label="序号" align="center" min-width="70">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column sortable width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="400" align="left" prop="Business" label="业务范围"></el-table-column>
         <el-table-column sortable width="125" align="center" show-overflow-tooltip label="有效期至">
@@ -76,7 +77,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="供方名称" prop="CompanyName">
-              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="请输入" style="width: 100%" readonly></el-input>
+              <el-input v-model="formData.CompanyName" :maxlength="255" placeholder="供方名称" style="width: 100%" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -128,6 +129,7 @@
 
     data () {
       return {
+        yearList: [],
         tableLoading: false,
         Excelurl: '',
         btnName: '打开',
@@ -214,9 +216,15 @@
         this.cardTitle = '外部市场'
       }
       this.initDatas()
+      this.getYearList()
     },
 
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       isAccess () {
         let params = {
           RoleId: '10000203'
@@ -247,13 +255,13 @@
         }
         api.exportExcelAll(params, this.$axios).then(res => {
           this.loading = false
-          let docurl = res.data
+          let docUrl = res.data
           // 内网服务器专用
-          if (process.client && docurl.indexOf('upfile') === 0) {
+          if (process.client && docUrl.indexOf('upfile') === 0) {
             const myDomain = window.location.host
-            location.href = 'http://' + myDomain + '/' + docurl
+            location.href = 'http://' + myDomain + '/' + docUrl
           } else {
-            location.href = 'http://' + docurl
+            location.href = 'http://' + docUrl
           }
         })
       },
@@ -276,7 +284,8 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           CatalogType: this.formData.CatalogType,
-          Status: ''
+          Status: '',
+          Year: '' // 年度,这里原系统搜的是申请时间即本系统的创建时间
         }
         if (this.formData.CatalogType == '6') {
           params.Status = '2'
@@ -288,7 +297,7 @@
           this.CreateOn[1].setMinutes(59)
           this.CreateOn[1].setSeconds(59)
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
-          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1])) // 这里实际是查的ValidityTo字段
         }
         // 查询条件
         Object.assign(params, this.searchForm)
@@ -311,7 +320,7 @@
         }
       },
       // 列表排序功能
-      orderby (column) {
+      orderBy (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -15,7 +15,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 1">初审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 2">复审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 5">审批</el-button>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="auhistory">审批流程</el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="authHistory">审批流程</el-button>
             <router-link :to="'/oilsupplier/oilcatalog?catalogType=7'">
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="isEdit && formData.Status <= 0">返回</el-button>
           </router-link>
@@ -23,11 +23,11 @@
         </div>
       </div>
 
-      <el-form label-width="150px" ref="EntityForm" :model="formData" :disabled="formData.Status > 0">
+      <el-form label-width="100px" ref="EntityForm" :model="formData" :disabled="formData.Status > 0">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="提交人" prop="Submitter">
-              <el-input v-model="formData.Submitter" :readonly="true" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.Submitter" readonly placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <!--<el-col :span="6">-->
@@ -39,20 +39,27 @@
               <!--</el-select>-->
             <!--</el-form-item>-->
           <!--</el-col>-->
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="类型">
-<!--              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable-->
-<!--                          default-first-option :disabled="formData.Status > 0">-->
-<!--                <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-              <el-input v-model="formDataType" :readonly="true" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="Type" v-model="formData.Type" placeholder="请选择类型" style="width: 100%" filterable
+                          default-first-option :disabled="formData.Status > 0 || formData.Id > 0">
+                <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">
+                </el-option>
+              </el-select>
+              <!--<el-input v-model="formDataType" :readonly="formData.Status > 0 || formData.Id > 0" placeholder="请输入" style="width: 100%"></el-input>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申报单位" prop="Dept">
+              <el-input v-model="formData.Dept" :readonly="formData.Status > 0" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="初审人员" prop="FirstAudit" :rules="{ required: true, message: '初审人员不能为空', trigger: 'change'}">
               <!--<el-input ref="selectAuditer" readonly v-model="formData.FirstAuditName" placeholder="请选择初审人">-->
-                <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow" :readonly="formData.Status > 0"></el-button>-->
+              <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow" :readonly="formData.Status > 0"></el-button>-->
               <!--</el-input>-->
               <el-select ref="selectAuditer"
                          v-model="formData.FirstAudit"
@@ -69,24 +76,21 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="复审人员" prop="SecondAudit" :rules="{ required: true, message: '复审人员不能为空', trigger: 'change'}">
               <el-select ref="secondAudit" v-model="formData.SecondAudit" placeholder="请选择复审人" style="width: 100%" filterable
-                          default-first-option :disabled="formData.Status > 0">
-                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
+                         default-first-option :disabled="formData.Status > 0">
+                <el-option v-for="item in secAuditorOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="申报单位" prop="Dept">
-              <el-input v-model="formData.Dept" :readonly="true" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="16">
             <el-form-item label="备注" prop="Remark">
-              <el-input  type="textarea" v-model="formData.Remark"
-                        placeholder="请输入">
+              <el-input  type="textarea" v-model="formData.Remark" :autosize="{minRows: 3, maxRows: 5}" :readonly="formData.Status > 0"
+                         placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
@@ -105,36 +109,28 @@
       <el-table :data="entityList" border style="width: 100%" size="mini">
         <el-table-column label="操作" width="150px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="editOilcatalog(scope.row)" plain>编辑</el-button>
-            <el-popover placement="top" title="提示">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="danger" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" plain v-if="isEdit && scope.row.Status == 0">删除</el-button>
-            </el-popover>
+            <el-button type="primary" size="mini" @click="editOilCataLog(scope.row)" plain><span v-if="formData.Status <= 0">编辑</span><span v-else>查看</span></el-button>
+            <el-button v-if="isEdit && scope.row.Status == 0" slot="reference" type="danger" title="删除" style="margin-left:10px" @click="deleteClick(scope.row)" size="mini" plain>删除</el-button>
           </template>
 
         </el-table-column>
-        <!--<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>-->
-        <el-table-column sortable width="120" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
+        <el-table-column min-width="50" align="center" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="200" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="LegalPerson" label="法人姓名"></el-table-column>
-        <el-table-column sortable width="120" align="center" show-overflow-tooltip prop="IDCode" label="法人身份证号"></el-table-column>
-        <el-table-column sortable width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>
-        <el-table-column sortable width="150" align="center" show-overflow-tooltip prop="USCCode" label="全国统一信用代码"></el-table-column>
-        <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>
-        <el-table-column sortable width="655" align="center" show-overflow-tooltip prop="RecordScope" label="业务范围"></el-table-column>
-        <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="Remark" label="备注"></el-table-column>
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="IDCode" label="法人身份证号"></el-table-column>
+        <el-table-column sortable min-width="150" align="center" show-overflow-tooltip prop="USCCode" label="全国统一信用代码"></el-table-column>
+        <el-table-column sortable min-width="450" align="center" show-overflow-tooltip prop="RecordScope" label="业务范围"></el-table-column>
+        <!--<el-table-column sortable width="120" align="center" show-overflow-tooltip prop="Address" label="企业注册地址"></el-table-column>-->
+        <!--<el-table-column sortable width="100" align="center" show-overflow-tooltip prop="RegCapital" label="注册资本"></el-table-column>-->
+        <el-table-column sortable min-width="100" align="center" show-overflow-tooltip prop="Remark" label="备注"></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>
 
@@ -148,50 +144,42 @@
           </span>
         </span>
       </div>
-      <el-table :data="entityList" border style="width: 100%" @sort-change="orderby" size="mini">
+      <el-table :data="entityList" border style="width: 100%" @sort-change="orderBy" size="mini">
         <el-table-column label="操作" width="150px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="editOilcatalog(scope.row)" plain>编辑</el-button>
-            <el-popover placement="top" title="提示">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="danger" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="danger" title="删除" style="margin-left:10px" size="mini" plain v-if="isEdit && scope.row.Status == 0">删除</el-button>
-            </el-popover>
+            <el-button type="primary" size="mini" @click="editOilCataLog(scope.row)" plain><span v-if="formData.Status <= 0">编辑</span><span v-else>查看</span></el-button>
+            <el-button v-if="isEdit && scope.row.Status == 0" slot="reference" type="danger" title="删除" style="margin-left:10px" @click="deleteClick(scope.row)" size="mini" plain>删除</el-button>
           </template>
 
         </el-table-column>
-        <!--<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>-->
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
+        <el-table-column sortable min-width="80" align="center" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
+        <el-table-column sortable min-width="250" align="center" show-overflow-tooltip prop="CompanyName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="500" align="center" show-overflow-tooltip prop="Business" label="业务范围"></el-table-column>
-        <el-table-column sortable min-width="200" align="center" show-overflow-tooltip label="有效期起止">
+        <el-table-column sortable width="100" align="center" show-overflow-tooltip label="有效期至">
           <template slot-scope="scope">
-            {{(jstimehandle(scope.row.ValidityFrom))}}--{{(jstimehandle(scope.row.ValidityTo))}}
+            {{(jsTimeHandle(scope.row.ValidityTo))}}
           </template>
         </el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Remark" label="备注"></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>
 
     <choose-auditor ref="chooseAuditor"
-                    @close="setAuditer"
+                    @close="setAuditor"
                     @hideChooseAuditer="chooseAuditorVisible=false"
                     :visible="chooseAuditorVisible"></choose-auditor>
 
 
-    <el-dialog :title="dialogtitle"
-               :visible.sync="showadddialog"
+    <el-dialog :title="dialogTitle"
+               :visible.sync="showAddDialog"
                width="60%">
       <el-form label-width="135px" ref="IncomeEntity" :model="incomeData" :rules="rules" :disabled="incomeData.Status != 0">
         <el-row>
@@ -245,14 +233,14 @@
           </el-col>
           <el-col :span="24">
             <el-form-item style="text-align: center;">
-              <el-button type="primary" size="mini" @click="saveOilcatalog" v-if="incomeData.Status == 0">保存</el-button>
+              <el-button type="primary" size="mini" @click="saveOilCataLog" v-if="incomeData.Status == 0">保存</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-dialog>
-    <el-dialog :title="markettitle"
-               :visible.sync="showaddmarketdialog"
+    <el-dialog :title="marketTitle"
+               :visible.sync="showAddMarketDialog"
                width="60%">
       <el-form label-width="135px" ref="IncomeEntity" :model="incomeData" :disabled="incomeData.Status != 0" :rules="rules1">
         <el-row>
@@ -262,15 +250,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效期" prop="ValidityDate">
-              <el-date-picker v-model="ValidityDate" type="daterange" range-separator="至"
-                              start-placeholder="有效期起" end-placeholder="有效期止" style="width: 100%"></el-date-picker>
+            <el-form-item label="有效期至" prop="ValidityTo">
+              <el-date-picker v-model="incomeData.ValidityTo" type="date" laceholder="有效期截止时间" style="width: 100%"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="营业范围" prop="Business">
+            <el-form-item label="业务范围" prop="Business">
               <el-input v-model="incomeData.Business"  type="textarea" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
@@ -282,13 +269,13 @@
           </el-col>
           <el-col :span="24">
             <el-form-item style="text-align: center;" v-if="incomeData.Status == 0">
-              <el-button type="primary" size="mini" @click="saveOilcatalog">保存</el-button>
+              <el-button type="primary" size="mini" @click="saveOilCataLog">保存</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-dialog>
-    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+    <el-dialog title="审批流程" :visible.sync="auditHistoryShow" width="1200px">
       <wf-multi-history :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
@@ -342,7 +329,8 @@
       /// 注册资金限制
       var checkMoney = (rule, value, callback) => {
         if (value < 0) {
-          callback(new Error('注册资金不能小于0'))
+          // callback(new Error('注册资金不能小于0'))
+          callback()
         } else {
           callback()
         }
@@ -361,34 +349,35 @@
         }
       }
       var checkCommercialNo = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入统一社会信用代码'))
-        } else {
+        if (value) {
+          // callback(new Error('请输入统一社会信用代码'))
           let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
           if (!re4.test(this.incomeData.USCCode)) {
             callback(new Error('请填写正确的18位统一社会信用代码'))
           } else {
             callback()
           }
+        } else {
+          callback()
         }
       }
 
       return {
         formDataType: '',
         firOptions: [],
-        showaddmarketdialog: false,
+        showAddMarketDialog: false,
         dialogMakeSure: false,
-        audithistoryshow: false,
+        auditHistoryShow: false,
         chooseAuditorVisible: false,
-        showadddialog: false,
+        showAddDialog: false,
         auditBtn: false,
         isEdit: true,
         loading: false,
         ValidityDate: null,
         cardType: '',
-        auditstepcode: '',
-        markettitle: '',
-        dialogtitle: '',
+        auditStepCode: '',
+        marketTitle: '',
+        dialogTitle: '',
         // 分页参数
         size: 10,
         currentPage: 1,
@@ -400,7 +389,7 @@
         },
 
         organizeOption: [],
-        secauditerOptions: [],
+        secAuditorOptions: [],
         entityList: [],
         TypeOptions: [
           {
@@ -475,10 +464,10 @@
             { required: true, message: '注册地址不能为空', trigger: 'blur' }
           ],
           USCCode: [
-            { required: true, validator: checkCommercialNo, trigger: 'change' }
+            { required: false, validator: checkCommercialNo, trigger: 'change' }
           ],
           RegCapital: [
-            { required: true, validator: checkMoney, trigger: 'change' },
+            { required: false, validator: checkMoney, trigger: 'change' },
             { type: 'number', message: '只能输入数字', trigger: 'blur' }
           ],
           RecordScope: [
@@ -516,13 +505,13 @@
       } else {
         this.formData.Id = 0
       }
-      this.getFirAuditerByDept()
+      this.getFirAuditorByDept()
     },
     methods: {
-      getFirAuditerByDept () {
-        let deptid = this.authUser.Profile.DepartmentId
-        let auditstepcode = 'FIRST_TRIAL' // 初审人
-        sipapi.getFirAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+      getFirAuditorByDept () {
+        let deptId = this.authUser.Profile.DepartmentId
+        let auditStepCode = 'FIRST_TRIAL' // 初审人
+        sipapi.getFirAuditerByDept(deptId, auditStepCode, this.$axios).then(res => {
           this.firOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -564,7 +553,7 @@
       isAccess () {
         let params = {
           id: this.formData.Id,
-          auditstepcode: this.auditstepcode,
+          auditStepCode: this.auditStepCode,
           processkey: this.formData.ProcessKey
         }
         apiCert.isAccess(params, this.$axios).then(res => {
@@ -575,8 +564,8 @@
       },
 
       // 审批流程
-      auhistory () {
-        this.audithistoryshow = true
+      authHistory () {
+        this.auditHistoryShow = true
       },
       submitEntity () {
         if (this.formData.Id === 0) {
@@ -598,7 +587,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.showadddialog = false
+          this.showAddDialog = false
           this.loading = true
           api.commitAudit(this.formData.Id, this.$axios).then(res => {
             if (res.data.code === 0) {
@@ -606,7 +595,7 @@
                 type: 'success',
                 message: res.data.message
               })
-              // this.showadddialog = false
+              // this.showAddDialog = false
               this.initDatas()
             } else {
               this.$message({
@@ -618,7 +607,7 @@
           })
         })
       },
-      editOilcatalog (val) {
+      editOilCataLog (val) {
         this.incomeData.Id = val.Id
         this.incomeData.SubId = val.SubId
         this.incomeData.CatalogType = val.CatalogType
@@ -634,18 +623,18 @@
         this.incomeData.Status = val.Status
         this.ValidityDate = [new Date(val.ValidityFrom), new Date(val.ValidityTo)]
         if (this.cardType === '6') {
-          this.markettitle = '编辑外部市场目录'
-          this.showaddmarketdialog = true
+          this.marketTitle = '编辑外部市场目录'
+          this.showAddMarketDialog = true
         } else {
-          this.dialogtitle = '编辑收入业务目录'
-          this.showadddialog = true
+          this.dialogTitle = '编辑收入业务目录'
+          this.showAddDialog = true
         }
       },
       //  添加外部市场
       addMarketItems () {
         // this.clearIncomeData()
         this.incomeData.Id = 0
-        this.markettitle = '添加外部市场目录'
+        this.marketTitle = '添加外部市场目录'
         if (this.formData.Id === 0) {
           this.$message({
             type: 'warning',
@@ -653,12 +642,12 @@
           })
           return
         }
-        this.showaddmarketdialog = true
+        this.showAddMarketDialog = true
       },
       addItems () {
         // this.clearIncomeData()
         this.incomeData.Id = 0
-        this.dialogtitle = '添加收入业务目录'
+        this.dialogTitle = '添加收入业务目录'
         if (this.formData.Id === 0) {
           this.$message({
             type: 'warning',
@@ -666,14 +655,14 @@
           })
           return
         }
-        this.showadddialog = true
+        this.showAddDialog = true
       },
 
       chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist('01')
         this.chooseAuditorVisible = true
       },
-      setAuditer (val, name) {
+      setAuditor (val, name) {
         console.log(val, name, 'dd')
         this.formData.FirstAudit = val
         this.formData.FirstAuditName = name
@@ -681,10 +670,10 @@
         // this.auditOrgChang(this.formData.FirstAudit)
       },
       auditOrgChang () {
-        let auditstepcode = 'SECOND_TRIAL'
-        sipapi.getAuditerByFirst(this.formData.FirstAudit, auditstepcode, this.$axios)
+        let auditStepCode = 'SECOND_TRIAL'
+        sipapi.getAuditerByFirst(this.formData.FirstAudit, auditStepCode, this.$axios)
           .then(res => {
-            this.secauditerOptions = res.data.item
+            this.secAuditorOptions = res.data.item
           })
           .catch(err => {
             console.error(err)
@@ -702,24 +691,25 @@
         })
       },
 
-      saveOilcatalog () {
+      saveOilCataLog () {
         // this.incomeData.RegCapital = parseFloat(this.incomeData.RegCapital)
         this.incomeData.SubId = this.formData.Id
         this.incomeData.CatalogType = parseInt(this.formData.Type)
-        if (this.ValidityDate && this.ValidityDate.length === 2) {
-          this.ValidityDate[1].setHours(23)
-          this.ValidityDate[1].setMinutes(59)
-          this.ValidityDate[1].setSeconds(59)
-          this.incomeData.ValidityFrom = this.ValidityDate[0]
-          this.incomeData.ValidityTo = this.ValidityDate[1]
+        this.incomeData.Dept = this.formData.Dept
+        if (this.incomeData.Dept === '') {
+          this.$message({
+            type: 'warning',
+            message: '申报单位不能为空'
+          })
+          return
         }
         if (this.incomeData.Id > 0) {
-          this.editOilcatalogEntity()
+          this.editOilCataLogEntity()
         } else {
-          this.addOilcatalogEntity()
+          this.addOilCataLogEntity()
         }
       },
-      editOilcatalogEntity () {
+      editOilCataLogEntity () {
         this.$refs['IncomeEntity'].validate((valid) => {
           if (valid) {
             catapi.updateEntity(this.incomeData.Id, this.incomeData, this.$axios).then(res => {
@@ -728,9 +718,9 @@
                   type: 'success',
                   message: res.data.message
                 })
-                this.initincomeDatas()
-                this.showaddmarketdialog = false
-                this.showadddialog = false
+                this.initInComeDatas()
+                this.showAddMarketDialog = false
+                this.showAddDialog = false
               } else {
                 this.$message({
                   type: 'warning',
@@ -741,7 +731,7 @@
           }
         })
       },
-      addOilcatalogEntity () {
+      addOilCataLogEntity () {
         let _this = this
         _this.$refs['IncomeEntity'].validate((valid) => {
           if (valid) {
@@ -751,9 +741,9 @@
                   type: 'success',
                   message: res.data.message
                 })
-                _this.initincomeDatas()
-                _this.showadddialog = false
-                this.showaddmarketdialog = false
+                _this.initInComeDatas()
+                _this.showAddDialog = false
+                this.showAddMarketDialog = false
               } else {
                 _this.$message({
                   type: 'warning',
@@ -774,14 +764,14 @@
             this.entrydetail.instance = this.formData.WorkflowId
             this.cardType = this.formData.Type
             this.auditOrgChang(this.formData.FirstAudit)
-            this.initincomeDatas()
+            this.initInComeDatas()
 
             if (this.formData.Status === '1') {
-              this.auditstepcode = 'FIRST_TRIAL'
+              this.auditStepCode = 'FIRST_TRIAL'
             } else if (this.formData.Status === '2') {
-              this.auditstepcode = 'SECOND_TRIAL'
+              this.auditStepCode = 'SECOND_TRIAL'
             } else if (this.formData.Status === '5') {
-              this.auditstepcode = 'PROF_REGULATION'
+              this.auditStepCode = 'PROF_REGULATION'
             }
             if (this.formData.CreateUserId != '') {
               if (this.authUser.Profile.Id != this.formData.CreateUserId) {
@@ -794,7 +784,7 @@
           })
         }
       },
-      initincomeDatas () {
+      initInComeDatas () {
         // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -864,46 +854,33 @@
           console.error(err)
         })
       },
-
-      deleteEntity (row) {
-        catapi.deleteEntity(row.Id, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            this.initincomeDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
+      deleteClick (row) {
+        this.$confirm('此操作将彻底删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
+          .then(() => {
+            catapi.deleteEntity(row.Id, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                this.initInComeDatas()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+          })
       },
-      clearIncomeData () {
-        Object.assign(this.incomeData, this.incomeDataTmp)
-        // this.incomeData.Id = ''
-        // this.incomeData.SubId = ''
-        // this.incomeData.CatalogType = ''
-        // this.incomeData.CompanyName = ''
-        // this.incomeData.LegalPerson = ''
-        // this.incomeData.Address = ''
-        // this.incomeData.USCCode = ''
-        // this.incomeData.RegCapital = ''
-        // this.incomeData.RecordScope = ''
-        // this.incomeData.IDCode = ''
-        // this.incomeData.Business = ''
-        // this.incomeData.ProcessKey = ''
-        // this.incomeData.Status = ''
-        // this.ValidityDate = null
-      },
-
-
       // 列表排序功能
-      orderby (column) {
+      orderBy (column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -931,7 +908,7 @@
         this.currentPage = 1
         this.initDatas()
       },
-      jstimehandle (val) {
+      jsTimeHandle (val) {
         if (val === '' || val === '0001-01-01T00:00:00Z') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {

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

@@ -14,7 +14,13 @@
             <el-date-picker size="mini" style="width: 220px" v-model="SubmitOn" type="daterange" range-separator="至"
                             start-placeholder="有效期" end-placeholder="有效期"></el-date-picker>
           </el-form-item>
-
+          <el-form-item label="类型">
+            <el-select ref="Type" size="mini" v-model="searchForm.Type" clearable placeholder="选择类型" style="width: 100px" filterable default-first-option>
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="item in TypeOptions" :key="item.Id" :label="item.Name" :value="item.Id">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
               查询
@@ -50,7 +56,11 @@
           </template>
 
         </el-table-column>
-        <!--<el-table-column sortable min-width="80" align="center" show-overflow-tooltip prop="SupplierName" label="序号"></el-table-column>-->
+        <el-table-column width="80" align="center" label="序号">
+          <template slot-scope="scope">
+            <span>{{scope.$index+(currentPage - 1) * size + 1}} </span>
+          </template>
+        </el-table-column>
         <el-table-column sortable width="120" align="center" show-overflow-tooltip prop="Status" label="审批状态">
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
@@ -71,6 +81,7 @@
             <span>{{ strType(scope.row.Type) }}</span>
           </template>
         </el-table-column>
+        <el-table-column sortable align="center" show-overflow-tooltip prop="Dept" label="申报单位"></el-table-column>
         <el-table-column sortable align="center" show-overflow-tooltip prop="Submitter" label="申请人"></el-table-column>
         <el-table-column sortable align="center" show-overflow-tooltip prop="CreateOn" label="创建时间">
           <template slot-scope="scope" >
@@ -86,7 +97,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>
 
@@ -106,6 +117,16 @@
 
     data () {
       return {
+        TypeOptions: [
+          {
+            Id: '6',
+            Name: '外部市场'
+          },
+          {
+            Id: '7',
+            Name: '收入业务'
+          }
+        ],
         tableLoading: false,
         // 分页参数
         size: 10,
@@ -127,6 +148,7 @@
         // 查询项
         searchFormReset: {},
         searchForm: {
+          Type: ''
         }
       }
     },
@@ -156,7 +178,6 @@
         // 查询条件
         Object.assign(params, this.searchForm)
         this.tableLoading = true
-        console.log('走这里')
         api.getList(myCreateOn, params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount