Merge pull request 'jie' (#43) from jie into test

Reviewed-on: #43

src/views/worksheet/content/Content.vue

@@ -136,7 +136,7 @@ async function featchList() {
   try {
     taskpagination.pageNo += 1;
     const { data, total, pageCount } = await getTaskDetailPictureList(
-      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.pictureid }
+      { ...taskpagination, ...sortBy, checkDuplicateId: workStore.activeId, pictureId: taskDetailInfo.value.id }
     );
 
     totalCount.value = total;
@@ -223,10 +223,8 @@ async function queryDetail(checkDuplicateId: any) {
   refreshHandler();
 }
 async function handleSelect(item: any) {
-  taskDetailInfo.value = await getTaskDetailInfo(workStore.activeId);
-
+  taskDetailInfo.value = await getTaskDetailInfo(item.id)
   const packageid = workStore.getActiveId;
-
   if (isEmpty(packageid)) {
     listData.value.length = 0;
     totalCount.value = 0;
@@ -239,7 +237,7 @@ async function handleSelect(item: any) {
 async function sortHandler(orderby: "similarityScore" | "createdate") {
   selectedSortName.value = orderby;
   sortBy.orderName = orderby;
-  sortBy.orderType = sortBy.orderType === "desc" ? "desc" : "asc";
+  sortBy.orderType = sortBy.orderType === "asc" ? "desc" : "asc";
   refreshHandler();
 }
 
@@ -488,15 +486,21 @@ function reloadList() {
             <n-scrollbar style="max-height: 100%">
               <n-ellipsis style="max-width: 350px">任务ID：{{ taskDetailInfo.taskname }}</n-ellipsis>
               <div class="tags">
-                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == 1">{{ TASK_STATUS_OBJ[taskDetailInfo.historyStates]
+                <!-- <div class="tag tag-submiting" v-if="taskDetailInfo.workStatus == '1'">{{ TASK_STATUS_OBJ[taskDetailInfo.workStatus]
                 }}</div>
-                <div class="tag tag-approve" v-else-if="taskDetailInfo.historyStates == 2">{{
+                <div class="tag tag-submited" v-else-if="taskDetailInfo.workStatus == '2'">已审批</div>
+                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
-                <div class="tag tag-passed" v-else-if="taskDetailInfo.historyStates == 3">{{
+                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates]
-                }}</div>
-                <div class="tag tag-approved" v-else-if="taskDetailInfo.historyStates == 4">{{
+                }}</div> -->
+                <div class="tag tag-submiting" v-if="taskDetailInfo.historyStates == '1'">待审批</div>
+                <div class="tag tag-submited" v-else-if="taskDetailInfo.historyStates == 2 || taskDetailInfo.workStatus == 3">已审批</div>
+                <div class="tag tag-passed" v-if="taskDetailInfo.historyStates == 2">{{
                   TASK_STATUS_OBJ[taskDetailInfo.historyStates] }}</div>
+                <div class="tag tag-not-passed" v-else-if="taskDetailInfo.workStatus == 3">{{
+                  TASK_STATUS_OBJ[taskDetailInfo.historyStates]
+                }}</div>
               </div>
               <n-divider class="divider-line" />
               <div class="property">
@@ -909,17 +913,21 @@ function reloadList() {
         line-height: 16px;
       }
 
+      .tag-submited {
+        color: #507AFD;
+        border: 1px solid #507AFD;
+      }
       .tag-submiting {
-        color: #feaf2d;
-        border: 1px solid #feaf2d;
+        color: #FFB800;
+        border: 1px solid #FFB800;
       }
 
-      .tag-approve {
-        color: #398ade;
-        border: 1px solid #398ade;
+      .tag-passed {
+        color: #02C984;
+        border: 1px solid #02C984;
       }
 
-      .tag-passed {
+      .tag-not-passed {
         color: #ff7575;
         border: 1px solid #ff7575;
       }