待办

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

@@ -102,6 +102,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.Type = todolist.SUPPLIER
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}
@@ -130,6 +131,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.AppendType
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}
@@ -230,6 +232,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = "0"
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}
@@ -325,6 +328,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.Type = todolist.SUPPLIER
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}
@@ -353,6 +357,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.AppendType
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}
@@ -453,6 +458,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = "0"
+				todo.Status = item.Status
 				todolists = append(todolists, todo)
 			}
 		}

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

@@ -43,16 +43,21 @@
 
           <!--<el-table-column type="index" label="序号"></el-table-column>-->
 
-          <el-table-column label="待办类型" prop="Type">
+          <el-table-column label="待办类型" prop="Type" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入</span>
-              <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项</span>
-              <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审</span>
-              <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更</span>
-              <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更</span>
+              <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+              <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="类别" prop="SupplierTypeCode">
+          <!--<el-table-column label="当前状态" prop="Status" align="center">-->
+            <!--&lt;!&ndash;<template slot-scope="scope">&ndash;&gt;-->
+              <!--&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">
             <template slot-scope="scope">
               <span v-if="scope.row.SupplierTypeCode=='01'">物资类</span>
               <span v-if="scope.row.SupplierTypeCode=='02'">基建类</span>
@@ -60,9 +65,9 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="公司名称" prop="SupplierName"></el-table-column>
+          <el-table-column label="公司名称" prop="SupplierName" align="center"></el-table-column>
 
-          <el-table-column label="执行人" prop="UserName"></el-table-column>
+          <el-table-column label="执行人" prop="UserName" align="center"></el-table-column>
 
           <el-table-column label="操作" width="130" align="center" fixed="right">
             <template slot-scope="scope">
@@ -83,11 +88,11 @@
 
             <el-table-column label="已办类型" prop="Type">
               <template slot-scope="scope">
-                <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入</span>
-                <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项</span>
-                <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审</span>
-                <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更</span>
-                <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更</span>
+                <span v-if="scope.row.Type=='1'" style="color:#E6A23C">准入-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <span v-if="scope.row.Type=='2'" style="color:#E6A23C">增项-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <span v-if="scope.row.Type=='3'" style="color:#E6A23C">年审-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <span v-if="scope.row.Type=='4'" style="color:#E6A23C">信息变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
+                <span v-if="scope.row.Type=='5'" style="color:#E6A23C">资质变更-{{statusStr(scope.row.Status, scope.row.Type)}}</span>
               </template>
             </el-table-column>
             <el-table-column label="类别" prop="SupplierTypeCode">
@@ -271,6 +276,50 @@
           console.error(err)
         })
       },
+      statusStr (val, type) {
+        switch (val) {
+          case '':
+            return '待提交'
+          case '0':
+            return '待提交'
+          case '1':
+            return '待初审'
+          case '-1':
+            return '初审未通过'
+          case '2':
+            return '待复审'
+          case '-2':
+            return '复审未通过'
+          case '3':
+            return '待专业处室分办'
+          case '4':
+            return '待专业处室审批'
+          case '-4':
+            return '专业处室审批未通过'
+          case '5':
+            if (type == '4' || type == '5') {
+              return '待企业法规处审批'
+            } else {
+              return '待集中评审'
+            }
+          case '-5':
+            if (type == '4' || type == '5') {
+              return '企业法规处审批未通过'
+            } else {
+              return '集中评审未通过'
+            }
+          case '6':
+            return '待缴费'
+          case '7':
+            return '待入库'
+          case '8':
+            return '已入库'
+          case '9':
+            return '未通过'
+          default:
+            return val
+        }
+      },
       handleCurrentChange (value) {
         this.currentPage = value
         this.initData()

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

@@ -742,7 +742,7 @@
               if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
               this.delete_flat = false
               }
-            
+
               this.$refs["GoodsInfo"].CityAry = [];
               this.$refs["GoodsInfo"].CityAry.push(this.formData.Province);
               this.$refs["GoodsInfo"].CityAry.push(this.formData.City);