From 04b480da7d6c1aaa0e387d4b5767d8c73ff43b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=80=98=E7=A8=B7?= <18026623439@163.com>
Date: Tue, 8 Dec 2020 17:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95=E5=BF=AB?=
 =?UTF-8?q?=E9=80=92=E5=8D=95=E5=8F=B7=E9=94=99=E8=AF=AF=E6=97=B6=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yxStoreOrder.js        |  8 ++++++
 src/views/shop/order/form.vue  | 45 +++++++++++++++++++++++-----------
 src/views/shop/order/index.vue | 11 ++++++++-
 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/api/yxStoreOrder.js b/src/api/yxStoreOrder.js
index e0459ea..4d40ce2 100644
--- a/src/api/yxStoreOrder.js
+++ b/src/api/yxStoreOrder.js
@@ -23,6 +23,14 @@ export function edit(data) {
   })
 }
 
+export function updateDelivery(data) {
+  return request({
+    url: 'api/yxStoreOrder/updateDelivery',
+    method: 'put',
+    data
+  })
+}
+
 export function editT(data) {
   return request({
     url: 'api/yxStoreOrder/check',
diff --git a/src/views/shop/order/form.vue b/src/views/shop/order/form.vue
index e5ab10f..adeff3f 100644
--- a/src/views/shop/order/form.vue
+++ b/src/views/shop/order/form.vue
@@ -8,7 +8,7 @@
             v-for="item in express"
             :key="item.id"
             :label="item.name"
-            :value="item.id"
+            :value="item.name"
           />
         </el-select>
       </el-form-item>
@@ -25,7 +25,7 @@
 
 <script>
 
-import { add, edit, get } from '@/api/yxStoreOrder'
+import { add, edit, get,updateDelivery } from '@/api/yxStoreOrder'
 export default {
   props: {
     isAdd: {
@@ -79,19 +79,36 @@ export default {
       })
     },
     doEdit() {
-      edit(this.form).then(res => {
-        this.resetForm()
-        this.$notify({
-          title: '操作成功',
-          type: 'success',
-          duration: 2500
+      if(this.form._status == 4){
+        updateDelivery(this.form).then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '操作成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        }).catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
         })
-        this.loading = false
-        this.$parent.init()
-      }).catch(err => {
-        this.loading = false
-        console.log(err.response.data.message)
-      })
+      }else{
+        edit(this.form).then(res => {
+          this.resetForm()
+          this.$notify({
+            title: '操作成功',
+            type: 'success',
+            duration: 2500
+          })
+          this.loading = false
+          this.$parent.init()
+        }).catch(err => {
+          this.loading = false
+          console.log(err.response.data.message)
+        })
+      }
+
     },
     resetForm() {
       this.dialog = false
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 7ab559c..d54ee40 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -159,6 +159,14 @@
                     @click="edit(scope.row)"
                   >
                     去发货</el-button>
+                  <el-button
+                    v-if="scope.row._status == 4"
+                    v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']"
+                    size="mini"
+                    type="primary"
+                    @click="edit(scope.row)"
+                  >
+                    修改快递</el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-button
@@ -396,7 +404,8 @@
           shippingType: data.shippingType,
           isChannel: data.isChannel,
           isRemind: data.isRemind,
-          isSystemDel: data.isSystemDel
+          isSystemDel: data.isSystemDel,
+          _status:data._status
         }
         _this.dialog = true
       },