目录申请待办

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

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/invoiceinfo"
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
+	"dashoo.cn/backend/api/business/oilsupplier/oilcatalog"
 	"dashoo.cn/backend/api/business/oilsupplier/oilcatalogsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
@@ -150,7 +151,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = listInfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
-				todo.SupplierTypeCode = listInfo.SupplierTypeName
+				todo.SupplierTypeCode = todolist.INFOCHANGE// listInfo.SupplierTypeName
 				todo.Status = listInfo.Status
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -167,6 +168,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = listinfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				todo.SupplierTypeCode = todolist.REGISTER
 				todo.Status = strconv.Itoa(listinfo.CheckStatus)
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -183,6 +185,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = listinfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				todo.SupplierTypeCode = todolist.INVOICE
 				todo.Status = "未开"
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -194,11 +197,18 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			var listinfo oilcatalogsub.OilCatalogSub
 			has = regsvc.GetEntityById(id, &listinfo)
 			if has {
+				var list oilcatalog.OilCatalog
+				regsvc.GetEntity(&list, "SubId=" + strconv.Itoa(listinfo.Id))
 				todo.Id = listinfo.Id
 				todo.Type = todolist.INCOME
-				todo.SupplierName = ""
+				todo.SupplierName = list.CompanyName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				if listinfo.Type == "6" {
+					todo.SupplierTypeCode = todolist.INCOME + "-6"
+				} else if  listinfo.Type == "7" {
+					todo.SupplierTypeCode = todolist.INCOME + "-7"
+				}
 				todo.Status = listinfo.Status
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -355,7 +365,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = listInfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
-				todo.SupplierTypeCode = listInfo.SupplierTypeName
+				todo.SupplierTypeCode = todolist.INFOCHANGE
 				todo.Status = listInfo.Status
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -372,6 +382,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = listinfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				todo.SupplierTypeCode = todolist.REGISTER
 				todo.Status = strconv.Itoa(listinfo.CheckStatus)
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -388,6 +399,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = listinfo.SupplierName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				todo.SupplierTypeCode = todolist.INVOICE
 				todo.Status = "已开"
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)
@@ -399,11 +411,18 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 			var listinfo oilcatalogsub.OilCatalogSub
 			has = regsvc.GetEntityById(id, &listinfo)
 			if has {
+				var list oilcatalog.OilCatalog
+				regsvc.GetEntity(&list, "SubId=" + strconv.Itoa(listinfo.Id))
 				todo.Id = listinfo.Id
 				todo.Type = todolist.INCOME
-				todo.SupplierName = ""
+				todo.SupplierName = list.CompanyName
 				todo.UserName = this.User.Realname
 				todo.TaskName = item.TaskName
+				if listinfo.Type == "6" {
+					todo.SupplierTypeCode = todolist.INCOME + "-6"
+				} else if  listinfo.Type == "7" {
+					todo.SupplierTypeCode = todolist.INCOME + "-7"
+				}
 				todo.Status = listinfo.Status
 				todo.CreateTime = item.CreateTime
 				todoliststemp = append(todoliststemp, todo)

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

@@ -73,6 +73,11 @@
               <span v-if="scope.row.SupplierTypeCode=='01'">物资类</span>
               <span v-if="scope.row.SupplierTypeCode=='02'">基建类</span>
               <span v-if="scope.row.SupplierTypeCode=='03'">技术服务类</span>
+              <span v-if="scope.row.SupplierTypeCode=='4'">信息变更</span>
+              <span v-if="scope.row.SupplierTypeCode=='5'">企业注册</span>
+              <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
+              <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
+              <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
             </template>
           </el-table-column>
 
@@ -135,6 +140,11 @@
                 <span v-if="scope.row.SupplierTypeCode=='01'">物资类</span>
                 <span v-if="scope.row.SupplierTypeCode=='02'">基建类</span>
                 <span v-if="scope.row.SupplierTypeCode=='03'">技术服务类</span>
+                <span v-if="scope.row.SupplierTypeCode=='4'">信息变更</span>
+                <span v-if="scope.row.SupplierTypeCode=='5'">企业注册</span>
+                <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
+                <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
+                <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
               </template>
             </el-table-column>