首页信息变更

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

@@ -662,7 +662,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		if receiveVal == "true" {
 			if list.Status == suppliercert.PROF_AUDIT_STATUS {
-				list.Status = suppliercert.NOPASS_STATUS
+				list.Status = suppliercert.NO_CENT_AUDIT_STATUS
 				list.AuditIndex = list.AuditIndex + 1
 			} else {
 				list.Status = backstatus

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

@@ -1079,11 +1079,11 @@ func (this *InfoChangeController) InfoAudit() {
 		userIds = utils.ToStr(infomodel.SecondAudit)
 		status = suppliercert.SECOND_TRIAL_STATUS
 		step = 2
-		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
+		backstatus = suppliercert.NOPASS_STATUS
 	} else if infomodel.Status == suppliercert.SECOND_TRIAL_STATUS {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
-		step = 3
+		step = 2
 		dictSvc := items.GetItemsService(utils.DBE)
 		deptIds := dictSvc.GetKeyValueItems("CENT_AUDIT")
 		var users []userRole.Base_RoleList
@@ -1151,7 +1151,7 @@ func (this *InfoChangeController) InfoAudit() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		if receiveVal == "true" {
 			if infomodel.Status == suppliercert.THIRD_TRIAL_STATUS {
-				infomodel.Status = suppliercert.NOPASS_STATUS
+				infomodel.Status = suppliercert.NO_CENT_AUDIT_STATUS
 			} else {
 				infomodel.Status = backstatus
 				// 审批历史

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

@@ -195,7 +195,8 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			for _, item := range listInfo {
 				todo.Id = item.Id
 				todo.Type = todolist.INFOCHANGE
-				todo.SupplierName = item.SupplierName
+				todo.SupplierId = strconv.Itoa(item.SupplierId)
+				todo.SupplierName = item.OldSupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.SupplierTypeName
 				todo.Status = item.Status

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

@@ -214,7 +214,7 @@
           this.$router.push('oilsupplier/annualaudit/' + val.SupplierId + '/auditoperation?certid=' + val.CertId + '&WorkflowId=' + val.WorkflowId + '&AnnualStatus=' + val.Status + '&annualId=' + val.Id + '&Step=' + val.Step)
           // /oilsupplier/annualaudit/' + scope.row.SupplierId + '/auditoperation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId+'&AnnualStatus='+scope.row.Status+'&annualId='+scope.row.Id+'&Step='+scope.row.Step
         } else if (val.Type === '4') {
-          this.$router.push('oilsupplier/infochange/' + val.Id + '/auditoperation?InfoStatus=' + val.Status)
+          this.$router.push('/oilsupplier/infochangech/' + val.Id + '/auditoperation?InfoStatus='+ val.Status+'&SupId='+val.SupplierId)
         } else if (val.Type === '5') {
           this.$router.push('oilsupplier/qualchange/' + val.SupplierId + '/auditoperation?certid=' + val.CertId + '&QualId=' + val.Id + '&QualStatus=' + val.Status)
         }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -662,12 +662,15 @@
         }
       },
       getchange(key) {
-        for (var i = 0; i < this.infochangedata.length; i++) {
-          if (this.infochangedata[i].SelectItem == key) {
-            return true
+        if (this.infochangedata) {
+          for (var i = 0; i < this.infochangedata.length; i++) {
+            if (this.infochangedata[i].SelectItem == key) {
+              return true
+            }
           }
+          return false
         }
-        return false
+
       },
       GetItemsDatas() {
         if (this.infoId) {
@@ -734,29 +737,6 @@
           this.textplaceholder = '退回意见不能少于5个字'
         }
       },
-      itemsfilter() {
-        try {
-          let entityArray = this.InfoData
-          let arr = this.infoitemsoptions
-          if (entityArray == null) {
-            this.selectuserlist = arr
-            return false
-          }
-          this.selectuserlist = []
-          for (var i = 0; i < entityArray.length; i++) {
-            for (var j = 0; j < arr.length; j++) {
-              if (entityArray[i].SelectItem === arr[j].value) {
-                this.selectuserlist.push(arr[j])
-                arr.splice(j, 1)
-                j--
-              }
-            }
-          }
-          this.selectuserlist = arr
-        } catch (e) {
-          console.log(e)
-        }
-      },
 
       auditget() {
         this.auditerOption = []