From 7d346defe2e3af48d84c3e97d98b6536e8c47330 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Tue, 4 Jun 2024 18:12:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Arefactor=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=20=E8=AE=A2=E5=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=20=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=95=B0=E6=8D=AE=E5=BA=93=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=A1=A8=E7=9A=84=E8=A7=A3=E6=9E=84=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=AF=BC=E8=87=B4=E6=8E=A5=E5=8F=A3=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=A4=B1=E8=B4=A5=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88quest=E5=AD=97=E6=AE=B5=20=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=94=B9=E7=94=A8=20status=20back=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=AD=A4=E4=BF=A9=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=20=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 src/components/ControllerTabs.vue       | 16 ++++++++--------
 src/components/QuestTabs.vue            |  6 ++++--
 src/store/index.js                      |  2 +-
 src/utils/api/table.js                  |  3 ++-
 src/views/layout/components/headbar.vue |  4 ++--
 src/views/layout/index.vue              |  4 ++--
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/ControllerTabs.vue b/src/components/ControllerTabs.vue
index 0d31cf1..3b38c23 100644
--- a/src/components/ControllerTabs.vue
+++ b/src/components/ControllerTabs.vue
@@ -62,11 +62,8 @@
               <el-select v-model="questForm.id" :filterable="isMobile" placeholder="请选择，也可输入搜索" :disabled="airLock">
                 <el-option v-for="item in questList" :key="item.id" :label="item.id" :value="item.id">
                   <span class="l">{{ item.id }}</span>
-                  <span class="l m-l-5">{{ item.name }}</span>
+                  <span class="l m-l-5">{{ item.receiver }}</span>
                   <span class="l m-l-5">{{ item.receive_site_name }}</span>
-                  <span v-for="product in item.products" :key="product.id" class="l m-l-5">{{
-                    product.name
-                  }}-{{ product.pro_buff }}-{{ product.num }}份</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -300,13 +297,13 @@ export default {
      */
     questList () {
       const plane = this.plane
-      return plane ? this.$store.state.questList.filter((item) => item.shop_id === plane.shop_id && item.quest === '1' && item.status === '20' && item.back === '0' && item.runing === null) : []
+      return plane ? this.$store.state.orderList.filter((item) => item.shop_id === plane.shop_id && item.status === 'processing' && item.back === 'normal') : []
     },
     /**
-     * @description: 已付款 已承接 已发货 订单列表
+     * @description: 已发货 订单列表
      */
     overQuestList () {
-      return this.$store.state.questList.filter((item) => item.quest === '1' && item.status === '30' && item.runing != null)
+      return this.$store.state.orderList.filter((item) => item.status === 'shipped')
     },
     /**
      * @description: 航线列表
@@ -539,6 +536,9 @@ export default {
     }
   },
   created () {
+    setTimeout(() => {
+      console.log(this.$store.state.orderList)
+    }, 3000)
     if (this.siteList && this.routeList) {
       this.airLock = this.siteList.some(item => item.runing === this.planesId)
     }
@@ -550,7 +550,7 @@ export default {
       } else { // 如果没有执行任务 把地图上航线清除
         this.$emit('clearRoute')
       }
-      this.$store.dispatch('fetchQuestList')// 刷新订单列表
+      this.$store.dispatch('fetchOrderList')// 刷新订单列表
       this.$store.dispatch('fetchSiteList')// 刷新站点列表
     },
     siteList (val) {
diff --git a/src/components/QuestTabs.vue b/src/components/QuestTabs.vue
index c7483a7..0892706 100644
--- a/src/components/QuestTabs.vue
+++ b/src/components/QuestTabs.vue
@@ -52,12 +52,12 @@
                 <el-button type="danger" icon="iconfont icon-zhengque">
                   <font class="m-l-5">同意退款</font>
                 </el-button>
-                <el-button @click="questAss(item.id, 'back', 'zero')" type="warning" icon="iconfont icon-cuowu">
+                <el-button @click="questAss(item.id, 'back', 'rejected')" type="warning" icon="iconfont icon-cuowu">
                   <font class="m-l-5">拒绝退款</font>
                 </el-button>
               </el-button-group>
               <el-button-group v-else-if="item.back == 'normal' && item.status == 'pending'">
-                <el-button @click="questAss(item.id, 'quest', '1')" type="primary" icon="iconfont icon-chengjie">
+                <el-button @click="questAss(item.id, 'status', 'processing')" type="primary" icon="iconfont icon-chengjie">
                   <font class="m-l-5">确认备货</font>
                 </el-button>
                 <el-button type="danger" icon="iconfont icon-cuowu">
@@ -89,6 +89,7 @@
 
 <script>
 import { parseTime } from '@/utils/index'
+import { questAss } from '@/utils/api/table'
 
 export default {
   data () {
@@ -126,6 +127,7 @@ export default {
     }
   },
   methods: {
+    questAss, // 修改订单
     parseTime, // 时间戳格式化
     orderState (back, status) {
       if (back === 'requested') {
diff --git a/src/store/index.js b/src/store/index.js
index 74b571d..8bf2765 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -926,7 +926,7 @@ const store = new Vuex.Store({
       }
     },
     /**
-     * @description: 获取订单列表 ps:待发货及待收货 并且不是退款成功状态
+     * @description: 获取订单列表
      * @return {*} 列表
      */
     async fetchOrderList ({ commit }) {
diff --git a/src/utils/api/table.js b/src/utils/api/table.js
index fb37fd9..41bad8a 100644
--- a/src/utils/api/table.js
+++ b/src/utils/api/table.js
@@ -21,7 +21,7 @@ export async function apiCrosFrequency (params) {
 /**
  * @description: 向改变订单承接任务api 提交数据  ()
  * @param {*} id 订单id
- * @param {*} state "quest"修改quest字段 "status"修改status字段
+ * @param {*} state "status"修改status字段 "back"修改back字段
  */
 export function questAss (id, state, val) {
   const data = new URLSearchParams()// post对象参数 转成 字符串连接
@@ -31,6 +31,7 @@ export function questAss (id, state, val) {
   api.post('questAss', data).then(res => {
     if (res.data.status === 1) {
       Message.success(res.data.msg)
+      store.dispatch('fetchOrderList')// 更新订单列表
     } else {
       Message.error(res.data.msg)
     }
diff --git a/src/views/layout/components/headbar.vue b/src/views/layout/components/headbar.vue
index 10a0940..c691322 100644
--- a/src/views/layout/components/headbar.vue
+++ b/src/views/layout/components/headbar.vue
@@ -168,8 +168,8 @@ export default {
       if (this.getQuestInterval !== null) {
         clearInterval(this.getQuestInterval)
       }
-      const pending = list.filter(item => item.status === 'pending')// 过滤处理中 订单
-      const processing = list.filter(item => item.status === 'processing')// 过滤 备货中订单
+      const pending = list.filter(item => item.status === 'pending' && item.back === 'normal')// 过滤处理中 订单
+      const processing = list.filter(item => item.status === 'processing' && item.back === 'normal')// 过滤 备货中订单
       const requested = list.filter(item => item.back === 'requested')// 过滤退款订单
       if (this.pendingCount < pending.length && this.pendingCount != null) { // 有新的数据 播放提示声音
         this.playMusic('newMsg')// 新消息 声音播放
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index a1552c9..ec8e7cc 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -55,8 +55,6 @@ export default {
     }
   },
   mounted () {
-  },
-  created () {
     /* init */
     this.$store.commit('app/setIsMobile')// 获取客户端平台类型
     this.$store.dispatch('fetchAirList')// 获取飞机列表
@@ -69,6 +67,8 @@ export default {
     this.$store.dispatch('fetchSkuList')// 获取商品sku列表
     this.$store.dispatch('fetchOrderList')// 获取订单列表
   },
+  created () {
+  },
   watch: {
     /**
      * @description: 异步拿到飞机列表之后 再进行一些初始化操作