From 05608162d31b857b32185608a669563d55b9f89f Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 1 Jun 2023 11:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/authUser.vue | 13 ++++----
 src/views/udi/trace/task/index.vue | 53 ++++++++++++++++++++++++++++--
 2 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index 0078d44..f963cb5 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -43,7 +43,8 @@
         <!--<el-table-column label="所属仓库" prop="warehouseName"></el-table-column>-->
         <el-table-column label="状态">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.userFlag | statusFilterType">{{
+            <el-tag :type="scope.row.userFlag | statusFilterType">
+              {{
                 scope.row.userFlag | statusFilterName
               }}
             </el-tag>
@@ -66,7 +67,7 @@
             <el-button
               type="text"
               @click.native="handleForm(scope.$index, scope.row)"
-        
+
             >编辑
             </el-button>
             <el-button
@@ -170,7 +171,7 @@
             </el-col>
             <el-col :span="11" type="flex">
               <el-form-item label="状态" prop="userFlag">
-                <el-radio-group v-model="formData.userFlag" 
+                <el-radio-group v-model="formData.userFlag"
                 :disabled="formData.userName === 'admin'? true : false">
                   <el-radio :label="1">正常</el-radio>
                   <el-radio :label="0">禁用</el-radio>
@@ -210,7 +211,7 @@
           <el-row :gutter="20" type="flex">
             <el-col :span="11" type="flex">
               <el-form-item label="角色">
-                <el-checkbox-group v-model="formData.roles" 
+                <el-checkbox-group v-model="formData.roles"
                 :disabled="formData.userName === 'admin'? true : false" >
                   <el-checkbox
                     v-for="item in roles"
@@ -388,7 +389,7 @@ export default {
     },
     findInv(val) {
       // 获取仓库列表
-     
+
     },
     handleCurrentChange(val) {
       this.query.page = val;
@@ -613,7 +614,7 @@ export default {
     this.getList();
     // 加载角色列表
     this.getRoleList();
-    
+
     this.findDeptMethod();
 
     //查询是否启用多级仓库，判断是否启用部门
diff --git a/src/views/udi/trace/task/index.vue b/src/views/udi/trace/task/index.vue
index 8ea027a..ccb48b2 100644
--- a/src/views/udi/trace/task/index.vue
+++ b/src/views/udi/trace/task/index.vue
@@ -132,12 +132,27 @@
           </template>
         </el-table-column>
 
-<!--        <el-table-column label="任务状态" prop="status" width="120"></el-table-column>-->
+
+<!--        <el-table-column label="任务状态" prop="status" width="120">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ formatTaskType1(scope.row) }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
         <el-table-column label="任务状态" prop="status" width="120">
           <template slot-scope="scope">
-            {{ formatTaskType1(scope.row) }}
+            <el-tag :type="scope.row.status | statusFilterType">
+              {{
+                scope.row.status | statusFilterName
+              }}
+            </el-tag>
           </template>
         </el-table-column>
+
+
+
+
+
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="180"></el-table-column>
         <el-table-column label="医疗器械注册人统一社会信用号" prop="creditNum" width="220"></el-table-column>
         <el-table-column label="产品名称" prop="cpmctymc" width="180"></el-table-column>
@@ -276,7 +291,18 @@
 
 import {isBlank} from "@/utils/strUtil";
 import {getTraceTaskList} from "@/api/udi/udiTrace";
-
+const formJson = {
+  id: "",
+  passWord: "",
+  userName: "",
+  checkPassword: "",
+  employeeName: "",
+  taskFlag: 1,
+  comments: '',
+  dept: null,
+  roles: [],
+  depts: [],
+};
 export default {
   data() {
     return {
@@ -294,6 +320,7 @@ export default {
         startAduditTime: null,
         endAduditTime: null,
       },
+      formData: formJson,
       total: 0,
       codeRelTotal: 0,
       loading: true,
@@ -369,6 +396,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
+
     formatTaskType(row) {
       switch (row.taskType) {
         case 1:
@@ -393,6 +421,7 @@ export default {
           return '任务状态有误！！';
       }
     },
+
     // //点击一行数据后发送的事件
     // handleSelectionChange(val) {
     //   this.currentRow = val;
@@ -507,6 +536,24 @@ export default {
       })
     },
   },
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        1: "gray",
+        2: "success",
+        3: "danger"
+      };
+      return statusMap[status];
+    },
+    statusFilterName(status) {
+      const statusMap = {
+        1: "未处理",
+        2: "正在处理",
+        3: "已处理"
+      };
+      return statusMap[status];
+    },
+  },
   created() {
     this.getTaskList()
   }