From 8093b4f0684bf5b34efb6f48c97ac3bfd4b4c07a Mon Sep 17 00:00:00 2001
From: liuye <yanran200830@163.com>
Date: Mon, 21 Nov 2022 15:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E5=B7=A5=E4=BD=9C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=BF=81=E7=A7=BB=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pingchang/AppWorkTask/AppWorkTask.vue     | 38 +++++++++++--------
 .../AppWorkTask/{components => }/create.vue   | 11 ++++--
 .../AppWorkTask/{components => }/detail.vue   | 10 ++---
 .../AppWorkTask/{components => }/finish.vue   |  8 ++--
 .../{components => }/finishDetail.vue         |  2 -
 .../{components => }/subDetail.vue            |  4 +-
 6 files changed, 39 insertions(+), 34 deletions(-)
 rename src/project/pingchang/AppWorkTask/{components => }/create.vue (97%)
 rename src/project/pingchang/AppWorkTask/{components => }/detail.vue (95%)
 rename src/project/pingchang/AppWorkTask/{components => }/finish.vue (97%)
 rename src/project/pingchang/AppWorkTask/{components => }/finishDetail.vue (98%)
 rename src/project/pingchang/AppWorkTask/{components => }/subDetail.vue (98%)

diff --git a/src/project/pingchang/AppWorkTask/AppWorkTask.vue b/src/project/pingchang/AppWorkTask/AppWorkTask.vue
index b0a6ec93..91928b61 100644
--- a/src/project/pingchang/AppWorkTask/AppWorkTask.vue
+++ b/src/project/pingchang/AppWorkTask/AppWorkTask.vue
@@ -37,10 +37,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+  import { mapState } from 'vuex'
   export default {
     appName: '工作任务',
-    // components: {AiTopFixed, AiAdd, AiEmpty},
     data() {
       return {
         index: 0,
@@ -50,6 +49,7 @@ import { mapState } from 'vuex'
         userSelect: false,
       }
     },
+
     computed: {
       ...mapState(['user']),
       tabs() {
@@ -63,8 +63,24 @@ import { mapState } from 'vuex'
       },
     },
 
-    onLoad() {
-      this.$dict.load("workTaskType")
+    created() {
+      this.$dict.load("workTaskType").then(() => {
+        this.getList()
+      })
+      uni.$on('getList', () => {
+        this.current = 1
+        this.getList()
+      })
+    },
+
+    onShow() {
+      document.title = '工作任务'
+      // uni.pageScrollTo({
+      //   duration: 0,
+      //   scrollTop: 0
+      // })
+      this.current = 1
+      this.getList()
     },
 
     methods: {
@@ -77,12 +93,13 @@ import { mapState } from 'vuex'
       },
       handleClick(item) {
         uni.navigateTo({
-          url: "/pages/workTask/components/detail?id=" + item.id + "&taskCode=" + item.taskCode + "&isMine=" + this.index
+          url: "./detail?id=" + item.id + "&taskCode=" + item.taskCode + "&isMine=" + this.index
         })
       },
       add() {
+        console.log(123)
         uni.navigateTo({
-          url: "/pages/workTask/components/create"
+          url: "./create"
         })
       },
 
@@ -136,15 +153,6 @@ import { mapState } from 'vuex'
     onReachBottom() {
       this.current = this.current + 1;
       this.getList()
-    },
-
-    onShow() {
-      uni.pageScrollTo({
-        duration: 0,
-        scrollTop: 0
-      })
-      this.current = 1
-      this.getList()
     }
   }
 </script>
diff --git a/src/project/pingchang/AppWorkTask/components/create.vue b/src/project/pingchang/AppWorkTask/create.vue
similarity index 97%
rename from src/project/pingchang/AppWorkTask/components/create.vue
rename to src/project/pingchang/AppWorkTask/create.vue
index 01edc455..69f610b0 100644
--- a/src/project/pingchang/AppWorkTask/components/create.vue
+++ b/src/project/pingchang/AppWorkTask/create.vue
@@ -106,12 +106,9 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
-  import AiSelectEnterprise from "../../../components/AiSelectEnterprise/AiSelectEnterprise";
 
   export default {
     name: "create",
-    components: {AiBack, AiSelectEnterprise},
     data() {
       return {
         index: null,
@@ -159,7 +156,13 @@
         }).then(res => {
           if (res.code == 0) {
             this.$u.toast("创建成功")
-            this.$refs["aiBack"].back()
+            uni.$emit('getList')
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1
+              })
+            }, 500)
+
           }
         })
       },
diff --git a/src/project/pingchang/AppWorkTask/components/detail.vue b/src/project/pingchang/AppWorkTask/detail.vue
similarity index 95%
rename from src/project/pingchang/AppWorkTask/components/detail.vue
rename to src/project/pingchang/AppWorkTask/detail.vue
index 17a2297d..1932bb8f 100644
--- a/src/project/pingchang/AppWorkTask/components/detail.vue
+++ b/src/project/pingchang/AppWorkTask/detail.vue
@@ -109,14 +109,10 @@
 </template>
 
 <script>
-  import AiTopFixed from "../../../components/AiTopFixed";
-  import AiBack from "../../../components/AiBack";
-  import AiEmpty from "../../../components/AiEmpty/AiEmpty";
   import {mapActions} from "vuex";
 
   export default {
     name: "detail",
-    components: {AiTopFixed, AiBack,AiEmpty},
     data() {
       return {
         current: 1,
@@ -180,17 +176,17 @@
       },
       createSubTask() {
         uni.navigateTo({
-          url: "/pages/workTask/components/create?taskCode=" + this.taskCode
+          url: "./create?taskCode=" + this.taskCode
         })
       },
       subDetail({id}) {
         uni.navigateTo({
-          url: "/pages/workTask/components/subDetail?id=" + id
+          url: "./subDetail?id=" + id
         })
       },
       handleClick() {
         uni.navigateTo({
-          url: "/pages/workTask/components/finish?taskCode=" + this.detail.taskCode + "&percent=" + this.detail.myUserInfo.percent
+          url: "./finish?taskCode=" + this.detail.taskCode + "&percent=" + this.detail.myUserInfo.percent
         })
       },
       change(e) {
diff --git a/src/project/pingchang/AppWorkTask/components/finish.vue b/src/project/pingchang/AppWorkTask/finish.vue
similarity index 97%
rename from src/project/pingchang/AppWorkTask/components/finish.vue
rename to src/project/pingchang/AppWorkTask/finish.vue
index 48d864c6..3c5e814d 100644
--- a/src/project/pingchang/AppWorkTask/components/finish.vue
+++ b/src/project/pingchang/AppWorkTask/finish.vue
@@ -31,11 +31,9 @@
 </template>
 
 <script>
-import AiBack from "../../../components/AiBack";
 
 export default {
   name: "finish",
-  components: {AiBack},
   data() {
     return {
       value: 0,
@@ -62,7 +60,11 @@ export default {
       }).then(res => {
         if (res.code == 0) {
           this.$u.toast("提交成功")
-          this.$refs["aiBack"].back()
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 1
+            })
+          }, 500)
         }
       })
     }
diff --git a/src/project/pingchang/AppWorkTask/components/finishDetail.vue b/src/project/pingchang/AppWorkTask/finishDetail.vue
similarity index 98%
rename from src/project/pingchang/AppWorkTask/components/finishDetail.vue
rename to src/project/pingchang/AppWorkTask/finishDetail.vue
index 30b005d8..8fcf514e 100644
--- a/src/project/pingchang/AppWorkTask/components/finishDetail.vue
+++ b/src/project/pingchang/AppWorkTask/finishDetail.vue
@@ -42,11 +42,9 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
 
   export default {
     name: "finishDetail",
-    components: {AiBack},
     data() {
       return {
         id: null,
diff --git a/src/project/pingchang/AppWorkTask/components/subDetail.vue b/src/project/pingchang/AppWorkTask/subDetail.vue
similarity index 98%
rename from src/project/pingchang/AppWorkTask/components/subDetail.vue
rename to src/project/pingchang/AppWorkTask/subDetail.vue
index 8a8e77d5..9068159b 100644
--- a/src/project/pingchang/AppWorkTask/components/subDetail.vue
+++ b/src/project/pingchang/AppWorkTask/subDetail.vue
@@ -75,11 +75,9 @@
 </template>
 
 <script>
-  import AiBack from "../../../components/AiBack";
 
   export default {
     name: "subDetail",
-    components: {AiBack},
     data() {
       return {
         id: null,
@@ -97,7 +95,7 @@
     methods: {
       finishDetail({id}){
         uni.navigateTo({
-          url:"/pages/workTask/components/finishDetail?id=" + id
+          url:"./finishDetail?id=" + id
         })
       },
       confirm() {