前端：已办待办字段排序

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -433,3 +433,30 @@ func (s *OilSupplierService) GetCertIds(entitiesPtr interface{}, where string) {
 
 	s.DBE.SQL(sql).Get(entitiesPtr)
 }
+
+func (s *OilSupplierService) ConverseSupplierTypeToInt(typeCode string) (typeInt int) {
+	if typeCode == "01" {
+		typeInt = 1
+	}else if typeCode == "02" {
+		typeInt = 2
+	} else if typeCode == "03" {
+		typeInt = 3
+	} else if typeCode == "4" {
+		typeInt = 4
+	} else if typeCode == "5" {
+		typeInt = 5
+	} else if typeCode == "8" {
+		typeInt = 8
+	} else if typeCode == "9" || typeCode == "9-6" || typeCode == "9-7" {
+		typeInt = 9
+	} else if typeCode == "10" {
+		typeInt = 10
+	} else if typeCode == "11" {
+		typeInt = 11
+	} else if typeCode == "12" {
+		typeInt = 12
+	} else {
+		typeInt = 0
+	}
+	return typeInt
+}

src/dashoo.cn/frontend_web/.gitignore

@@ -9,3 +9,4 @@ npm-debug.log
 
 # Nuxt generate
 dist
+*.zip

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

@@ -52,7 +52,7 @@
 
           <!--<el-table-column type="index" label="序号"></el-table-column>-->
 
-          <el-table-column label="待办类型" prop="Type" align="center">
+          <el-table-column label="待办类型" prop="Type" sortable align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{scope.row.TaskName}}</span>
@@ -62,9 +62,9 @@
               <!-- <span v-if="scope.row.Type=='7'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span> -->
               <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
               <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
-              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审</span>
-              <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审</span>
-              <span v-if="scope.row.Type=='12'" style="color:#E6A23C">合同日常评审</span>
+              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='12'" style="color:#E6A23C">合同日常评审-{{scope.row.TaskName}}</span>
             </template>
           </el-table-column>
 
@@ -73,16 +73,16 @@
           <!--&lt;!&ndash;{{statusStr(scope.row.Status, scope.row.Type)}}&ndash;&gt;-->
           <!--&lt;!&ndash;</template>&ndash;&gt;-->
           <!--</el-table-column>-->
-          <el-table-column label="类别" prop="SupplierTypeCode" align="center">
+          <el-table-column label="类别" prop="SupplierTypeCode" sortable align="center">
             <!-- <template slot-scope="scope" v-if="scope.row.Type=='10'">
               <span v-if="scope.row.SupplierTypeCode=='01'">供应商</span>
               <span v-if="scope.row.SupplierTypeCode=='02'">承包商</span>
               <span v-if="scope.row.SupplierTypeCode=='03'">服务商</span>
             </template> -->
             <template slot-scope="scope" >
-              <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10'&&scope.row.Type!='11'">物资类</span>
-              <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10'&&scope.row.Type!='11'">基建类</span>
-              <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type!='10'&&scope.row.Type!='11'">服务类</span>
+              <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10' && scope.row.Type!='11' && scope.row.Type!='12'">物资类</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10' && scope.row.Type!='11' && scope.row.Type!='12'">基建类</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && scope.row.Type!='10' && scope.row.Type!='11' && scope.row.Type!='12'">服务类</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>
@@ -96,17 +96,17 @@
 
           </el-table-column>
 
-          <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
+          <el-table-column label="公司名称" prop="SupplierName" sortable align="center"></el-table-column>
 
-          <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
+          <el-table-column label="执行人" prop="UserName" sortable align="center"></el-table-column>
 
-          <el-table-column label="提交时间" prop="CreateTime" align="center">
+          <el-table-column label="提交时间" prop="CreateTime" sortable align="center">
             <template slot-scope="scope">
               {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
             </template>
           </el-table-column>
 
-          <el-table-column label="当前状态" prop="Status" align="center">
+          <el-table-column label="当前状态" prop="Status" sortable align="center">
             <template slot-scope="scope">
               <span>{{statusStr(scope.row.Status, scope.row.Type)}}</span>
             </template>
@@ -140,7 +140,7 @@
           style="width: 100%"
           highlight-current-row v-loading="loading">
 
-          <el-table-column label="已办类型" prop="Type" align="center">
+          <el-table-column label="已办类型" prop="Type" sortable align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{scope.row.TaskName}}</span>
               <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{scope.row.TaskName}}</span>
@@ -149,12 +149,12 @@
               <span v-if="scope.row.Type=='5'" style="color:#E6A23C">企业注册-待审批</span>
               <span v-if="scope.row.Type=='8'" style="color:#E6A23C">发票</span>
               <span v-if="scope.row.Type=='9'" style="color:#E6A23C">目录申请-{{scope.row.TaskName}}</span>
-              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审</span>
-              <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审</span>
-              <span v-if="scope.row.Type=='12'" style="color:#E6A23C">合同日常评审</span>
+              <span v-if="scope.row.Type=='10'" style="color:#E6A23C">合同日常评审-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='11'" style="color:#E6A23C">合同年度评审-{{scope.row.TaskName}}</span>
+              <span v-if="scope.row.Type=='12'" style="color:#E6A23C">合同日常评审-{{scope.row.TaskName}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="类别" prop="SupplierTypeCode" align="center">
+          <el-table-column label="类别" prop="SupplierTypeCode" sortable align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.SupplierTypeCode=='01' && scope.row.Type!='10'&&scope.row.Type!='11'&&scope.row.Type!='12'">物资类</span>
               <span v-if="scope.row.SupplierTypeCode=='02' && scope.row.Type!='10'&&scope.row.Type!='11'&&scope.row.Type!='12'">基建类</span>
@@ -171,16 +171,16 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
+          <el-table-column label="公司名称" prop="SupplierName" sortable align="center"></el-table-column>
 
-          <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
+          <el-table-column label="执行人" prop="UserName" sortable align="center"></el-table-column>
 
-          <el-table-column label="完成时间" prop="CreateTime" align="center">
+          <el-table-column label="完成时间" prop="CreateTime" sortable align="center">
             <template slot-scope="scope">
               {{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}
             </template>
           </el-table-column>
-          <el-table-column label="当前状态" prop="Status" align="center">
+          <el-table-column label="当前状态" prop="Status" sortable align="center">
             <template slot-scope="scope">
               <span>{{statusStr(scope.row.Status, scope.row.Type)}}</span>
             </template>
@@ -1109,13 +1109,13 @@
           case '6':
             return '待交费'
           case '7':
-            if (type == '10' || type == '11') {
+            if (type == '10' || type == '11' || type == '12') {
               return '待企管法规处审批'
             } else {
               return '待入库'
             }
           case '8':
-            if (type == '10' || type == '11') {
+            if (type == '10' || type == '11' || type == '12') {
               return '已完成'
             } else {
               return '已入库'