直播售后订单和样式

src/api/live/liveOrder.js

@@ -78,26 +78,157 @@ export function syncExpress(orderId) {
 }
 
 
-export function updateErp(data) {
+
+export function listOrderitem(orderId) {
   return request({
-    url: '/live/liveOrder/updateErpOrder',
+    url: '/live/liveOrder/ltemlist/' + orderId,
+    method: 'get'
+  })
+}
+
+export function tuiOrder(data) {
+  return request({
+    url: '/live/liveOrder/tuiOrder',
+    method: 'put',
+    data: data
+  })
+}
+
+export function refundOrderMoney(data) {
+  return request({
+    url: '/live/liveOrder/refundOrderMoney',
     method: 'post',
     data: data
   })
 }
 
-export function listOrderitem(orderId) {
+
+export function getExpressByDeliverId(param) {
   return request({
-    url: '/live/liveOrder/ltemlist/' + orderId,
+    url: '/live/liveOrder/getExpressByDeliverId',
+    method: 'post',
+    data: param
+  })
+}
+
+/**
+ * 根据订单获取物流信息
+ * @param orderId
+ * @returns {*}
+ */
+export function getByOrderId(orderId){
+  return request({
+    url: '/live/liveOrder/getByOrderId/'+orderId,
+    method: 'get'
+  })
+}
+export function bindCustomer(data) {
+  return request({
+    url: '/live/liveOrder/bindCustomer',
+    method: 'post',
+    data: data
+  })
+}
+// 查询订单详细
+export function getLiveOrderAll(id) {
+  return request({
+    url: '/live/liveOrder/' + id,
+    method: 'get'
+  })
+}
+// 查询订单详细
+export function getLiveOrderAddress(id) {
+  return request({
+    url: '/live/liveOrder/queryAddress/' + id,
+    method: 'get'
+  })
+}
+// 查询电话
+export function getUserPhone(id) {
+  return request({
+    url: '/live/liveOrder/queryPhone/' + id,
     method: 'get'
   })
 }
 
-export function tuiOrder(data) {
+//审核
+export function auditPayRemain(data) {
   return request({
-    url: '/live/liveOrder/tuiOrder',
+    url: '/live/liveOrder/auditPayRemain',
+    method: 'post',
+    data: data
+  })
+}
+
+export function addTuiMoney(data) {
+  return request({
+    url: '/live/liveOrder/addTuiMoney',
+    method: 'post',
+    data: data
+  })
+}
+
+export function syncExpressB(data) {
+  return request({
+    url: '/live/liveOrder/syncExpress',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updateExpress(data) {
+  return request({
+    url: '/live/liveOrder/updateExpress',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getEroOrder(query) {
+  return request({
+    url: '/live/liveOrder/getEroOrder',
+    method: 'get',
+    params: query
+  })
+}
+
+export function editTuiMoney(data) {
+  return request({
+    url: '/live/liveOrder/editTuiMoney',
+    method: 'post',
+    data: data
+  })
+}
+
+export function finishOrder(data) {
+  return request({
+    url: '/live/liveOrder/finishOrder',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物流编号
+export function updateDeliveryId(data) {
+  return request({
+    url: '/live/liveOrder/editDeliveryId',
     method: 'put',
     data: data
   })
 }
 
+export function createErpOrder(query) {
+  return request({
+    url: '/live/liveOrder/createErpOrder',
+    method: 'get',
+    params: query
+  })
+}
+
+export function updateErp(data) {
+  return request({
+    url: '/live/liveOrder/updateErpOrder',
+    method: 'post',
+    data: data
+  })
+}

src/views/live/components/productAfterSalesOrder.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="order-content">
-      <div class="order-status" v-if="afterSales!=null" >
-          <el-steps :active="afterSales.status==4?afterSales.status+1:afterSales.status" align-center>
-            <el-step title="待审核(24小时自动审核)"></el-step>
-            <el-step title="平台已审核等待用户发货"></el-step>
-            <el-step title="用户已发货待仓库审核"></el-step>
-            <el-step title="财务审核"></el-step>
-            <el-step title="退款成功"></el-step>
-          </el-steps>
-      </div>
-      <div v-if="afterSales!=null">
+    <div class="order-status" v-if="afterSales!=null" >
+      <el-steps :active="afterSales.status==4?afterSales.status+1:afterSales.status" align-center>
+        <el-step title="待审核(24小时自动审核)"></el-step>
+        <el-step title="平台已审核等待用户发货"></el-step>
+        <el-step title="用户已发货待仓库审核"></el-step>
+        <el-step title="财务审核"></el-step>
+        <el-step title="退款成功"></el-step>
+      </el-steps>
+    </div>
+    <div v-if="afterSales!=null">
       <el-card shadow="never"  style="margin-top: 15px">
         <div class="operate-container">
           <span style="margin-left: 20px" class="color-danger">售后状态：
@@ -18,87 +18,87 @@
           <div class="operate-button-container"  >
             <el-button size="mini" v-hasPermi="['store:storeAfterSales:edit']" v-show="afterSales.salesStatus==0&&afterSales.status===1"  @click="addDelivery">编辑物流</el-button>
             <el-button size="mini"  @click="showOrder">查看订单</el-button>
-         </div>
+          </div>
         </div>
         <div style="margin: 20px 0px">
           <span class="font-small">基本信息</span>
         </div>
         <el-descriptions :column="4" border  >
-            <el-descriptions-item label="订单单号"  >
+          <el-descriptions-item label="订单单号"  >
                 <span v-if="afterSales!=null">
                   {{afterSales.orderCode}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="会员"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="会员"  >
                 <span v-if="user!=null">
                   {{user.nickname}}({{user.phone}})
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="退款金额"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="退款金额"  >
                 <span v-if="afterSales!=null">
                   {{afterSales.refundAmount}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="申请类型"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="申请类型"  >
                 <span v-if="afterSales!=null">
                   <el-tag prop="serviceType" v-for="(item, index) in serviceTypeOptions"    v-if="afterSales.serviceType==item.dictValue">{{item.dictLabel}}</el-tag>
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="申请原因"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="申请原因"  >
                 <span v-if="afterSales!=null">
                   {{afterSales.reasons}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="说明"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="说明"  >
                 <span v-if="afterSales!=null">
                   {{afterSales.explains}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="状态"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="状态"  >
                 <span v-if="afterSales!=null">
                   <el-tag   v-for="(item, index) in statusOptions"    v-if="afterSales.status==item.dictValue" >{{item.dictLabel}}</el-tag>
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="售后状态"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="售后状态"  >
                 <span v-if="afterSales!=null">
                   <el-tag  v-for="(item, index) in salesStatusOptions"    v-if="afterSales.salesStatus==item.dictValue" >{{item.dictLabel}}</el-tag>
                 </span>
-            </el-descriptions-item>
+          </el-descriptions-item>
         </el-descriptions>
         <div style="margin: 20px 0px">
           <span class="font-small">收货信息</span>
         </div>
         <el-descriptions   :column="4" border  >
-            <el-descriptions-item label="收货人"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.consignee}}
+          <el-descriptions-item label="收货人"  >
+                <span v-if="order!=null">
+                  {{order.userName}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收货人"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.consignee}}
+          </el-descriptions-item>
+          <!--            <el-descriptions-item label="收货人"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  {{order.userName}}-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <el-descriptions-item label="手机号码"  >
+                <span v-if="order!=null">
+                  {{order.userPhone}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="手机号码"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.phoneNumber}}
+          </el-descriptions-item>
+          <el-descriptions-item label="收货地址"  >
+                <span v-if="order!=null">
+                  {{order.userAddress}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收货地址"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.address}}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="快递公司"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.deliveryName}}
+          </el-descriptions-item>
+          <el-descriptions-item label="快递公司"  >
+                <span v-if="order!=null">
+                  {{order.deliveryName}}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="运单号"  >
-                <span v-if="afterSales!=null">
-                  {{afterSales.deliverySn}}
+          </el-descriptions-item>
+          <el-descriptions-item label="运单号"  >
+                <span v-if="order!=null">
+                  {{order.deliverySn}}
                 </span>
-            </el-descriptions-item>
+          </el-descriptions-item>
         </el-descriptions>
         <div style="margin-top: 20px">
           <span class="font-small">商品信息</span>
@@ -131,7 +131,7 @@
           </el-table-column>
           <el-table-column label="数量" width="180" align="center">
             <template slot-scope="scope">
-                {{JSON.parse(scope.row.jsonInfo).num}}
+              {{JSON.parse(scope.row.jsonInfo).num}}
             </template>
           </el-table-column>
           <el-table-column label="小计"  align="center">
@@ -180,12 +180,12 @@
       </div>
     </el-dialog>
     <el-dialog :title="show.title" v-if="show.open" :visible.sync="show.open" width="1000px" append-to-body>
-        <product-order  ref="productOrder" />
+      <product-order  ref="productOrder" />
     </el-dialog>
     <el-dialog :title="add.title" :visible.sync="add.open" width="500px" append-to-body>
 
-    <div slot="footer" class="dialog-footer">
-      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
+      <div slot="footer" class="dialog-footer">
+        <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
           <el-form-item label="id" prop="id" v-if="false">
             <el-input v-model="addForm.id" placeholder="请输入"  />
           </el-form-item>
@@ -196,10 +196,10 @@
             <el-input v-model="addForm.deliverySn" placeholder="请输入"  />
           </el-form-item>
         </el-form>
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel1">取 消</el-button>
-    </div>
-  </el-dialog>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel1">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -217,8 +217,8 @@ export default {
         title:"订单详情"
       },
       audit:{
-          title:"审核",
-          open:false,
+        title:"审核",
+        open:false,
       },
       add:{
         open:false,
@@ -260,13 +260,13 @@ export default {
         refundAmount: [
           { required: true, message: "退款金额不能为空", trigger: "blur" }
         ],
-         consignee: [
+        consignee: [
           { required: true, message: "退货联系人不能为空", trigger: "blur" }
         ],
         phoneNumber: [
           { required: true, message: "退货手机号不能为空", trigger: "blur" }
         ],
-         address: [
+        address: [
           { required: true, message: "退货地址不能为空", trigger: "blur" }
         ],
 
@@ -276,13 +276,13 @@ export default {
   },
   created() {
     this.getDicts("store_after_sales_sales_status").then((response) => {
-        this.salesStatusOptions = response.data;
+      this.salesStatusOptions = response.data;
     });
     this.getDicts("store_after_sales_status").then((response) => {
-        this.statusOptions = response.data;
+      this.statusOptions = response.data;
     });
-     this.getDicts("store_after_sales_service_type").then((response) => {
-        this.serviceTypeOptions = response.data;
+    this.getDicts("store_after_sales_service_type").then((response) => {
+      this.serviceTypeOptions = response.data;
     });
   },
   methods: {
@@ -290,12 +290,12 @@ export default {
       var id=this.afterSales.id;
       this.addForm.id = id;
       updateLiveAfterSales(this.addForm).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("编辑成功");
-                this.add.open = false;
-                this.getStoreAfterSales(id);
-              }
-            });
+        if (response.code === 200) {
+          this.msgSuccess("编辑成功");
+          this.add.open = false;
+          this.getLiveAfterSales(id);
+        }
+      });
     },
     cancel1(){
       this.add.open = false;
@@ -307,68 +307,70 @@ export default {
     },
     showOrder(){
       this.show.open=true;
-      const orderId = this.order.id ;
+      const orderId = this.order.orderId ;
       setTimeout(() => {
         this.$refs.productOrder.getOrder(orderId);
       }, 500);
     },
     handleAudit(){
-        this.audit.open=true;
-        this.form.serviceType=this.afterSales.serviceType;
-        this.form.salesId=this.afterSales.id;
-        this.form.refundAmount=this.afterSales.refundAmount;
+      this.audit.open=true;
+      this.form.serviceType=this.afterSales.serviceType;
+      this.form.salesId=this.afterSales.id;
+      this.form.refundAmount=this.afterSales.refundAmount;
     },
     submitAuditForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-           audit(this.form).then(response => {
-              if (response.code === 200) {
-                this.audit.open = false;
-                this.getStoreAfterSales(this.afterSales.id);
-                this.msgSuccess("操作成功");
-              }
-            });
+          audit(this.form).then(response => {
+            if (response.code === 200) {
+              this.audit.open = false;
+              this.getLiveAfterSales(this.afterSales.id);
+              this.msgSuccess("操作成功");
+            }
+          });
         }
       });
     },
     cancel(){
       var id=this.afterSales.id;
       this.$confirm('是否确认取消订单?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={salesId:id}
-          return cancel(data);
-        }).then(() => {
-          this.getStoreAfterSales(id);
-          this.msgSuccess("操作成功");
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        var data={salesId:id}
+        return cancel(data);
+      }).then(() => {
+        this.getLiveAfterSales(id);
+        this.msgSuccess("操作成功");
+      }).catch(function() {});
     },
     refund(){
       var id=this.afterSales.id;
       this.$confirm('是否确认收货,确认后将自动退款给客户', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={salesId:id}
-          console.log(data)
-          return refund(data);
-        }).then(() => {
-          this.getStoreAfterSales(id);
-          this.msgSuccess("操作成功");
-        }).catch(function() {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        var data={salesId:id}
+        console.log(data)
+        return refund(data);
+      }).then(() => {
+        this.getLiveAfterSales(id);
+        this.msgSuccess("操作成功");
+      }).catch(function() {});
     },
-    getStoreAfterSales(id){
-        getLiveAfterSales(id).then(response => {
-            this.afterSales = response.afterSales;
-            this.logs = response.logs;
-            this.items = response.items;
-            this.user=response.user;
-            this.order=response.order;
-        });
-     }
+    getLiveAfterSales(id){
+      getLiveAfterSales(id).then(response => {
+        console.log(response)
+        console.log(123)
+        this.afterSales = response.afterSales;
+        this.logs = response.logs;
+        this.items = response.items;
+        this.user=response.user;
+        this.order=response.order;
+      });
+    }
   }
 };
 </script>

src/views/live/components/productOrder.vue

@@ -1,164 +1,164 @@
 <template>
   <div class="order-content">
-      <div class="order-status" v-if="order!=null" >
-          <el-steps  :active="order.status==3?order.status+1:order.status" align-center>
-            <el-step title="待支付"></el-step>
-            <el-step title="待发货"></el-step>
-            <el-step title="待收货"></el-step>
-            <el-step title="交易完成"></el-step>
-          </el-steps>
-      </div>
-      <div>
+    <div class="order-status" v-if="order!=null" >
+      <el-steps  :active="order.status==3?order.status+1:order.status" align-center>
+        <el-step title="待支付"></el-step>
+        <el-step title="待发货"></el-step>
+        <el-step title="待收货"></el-step>
+        <el-step title="交易完成"></el-step>
+      </el-steps>
+    </div>
+    <div>
       <el-card shadow="never" style="margin-top: 15px">
-      <div class="operate-container"  v-if="order!=null">
+        <div class="operate-container"  v-if="order!=null">
         <span style="margin-left: 20px" class="color-danger">订单状态：
            <el-tag prop="status" v-for="(item, index) in statusOptions"   v-if="order.status==item.dictValue">{{item.dictLabel}}</el-tag>
         </span>
-        <div class="operate-button-container" >
-          <el-button size="mini" @click="editOrder()"  v-hasPermi="['store:storeOrder:edit']" >修改订单</el-button>
-        </div>
-        <div class="operate-button-container"  v-hasPermi="['store:storeOrder:finishOrder']" v-if="order.status===2">
-          <el-button size="mini" @click="finishOrder()" >确认收货</el-button>
-        </div>
-        <div class="operate-button-container" v-if="order.status==1||order.status==2"  v-hasPermi="['store:storeOrder:refundOrderMoney']"  >
-          <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
-        </div>
-<!--        <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >-->
-<!--          <el-button size="mini" @click="showExpress()" >查看物流</el-button>-->
-<!--        </div>-->
-        <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
-          <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>
-        </div>
-        <div class="operate-button-container" v-if="order.tuiMoneyStatus==1"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
-          <el-button size="mini" @click="editTuiMoney2()" >冻结</el-button>
-        </div>
+          <div class="operate-button-container" >
+            <el-button size="mini" @click="editOrder()"  v-hasPermi="['store:storeOrder:edit']" >修改订单</el-button>
+          </div>
+          <div class="operate-button-container"  v-hasPermi="['store:storeOrder:finishOrder']" v-if="order.status===2">
+            <el-button size="mini" @click="finishOrder()" >确认收货</el-button>
+          </div>
+          <div class="operate-button-container" v-if="order.status==1||order.status==2"  v-hasPermi="['store:storeOrder:refundOrderMoney']"  >
+            <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
+          </div>
+          <!--        <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >-->
+          <!--          <el-button size="mini" @click="showExpress()" >查看物流</el-button>-->
+          <!--        </div>-->
+          <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
+            <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>
+          </div>
+          <div class="operate-button-container" v-if="order.tuiMoneyStatus==1"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
+            <el-button size="mini" @click="editTuiMoney2()" >冻结</el-button>
+          </div>
 
-        <div class="operate-button-container" v-if="order.status==3&&order.tuiMoneyStatus==null"  v-hasPermi="['store:storeOrder:addTuiMoney']"  >
-          <el-button size="mini" @click="addTuiMoney()" >分佣</el-button>
-        </div>
+          <div class="operate-button-container" v-if="order.status==3&&order.tuiMoneyStatus==null"  v-hasPermi="['store:storeOrder:addTuiMoney']"  >
+            <el-button size="mini" @click="addTuiMoney()" >分佣</el-button>
+          </div>
 
-        <div class="operate-button-container" v-if="order.extendOrderId!=null"  v-hasPermi="['store:storeOrder:getEroOrder']"  >
-          <el-button size="mini" @click="showErpOrder()" >查看ERP订单信息</el-button>
-        </div>
-        <div class="operate-button-container" v-if="order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
-          <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
+          <div class="operate-button-container" v-if="order.extendOrderId!=null&&order.extendOrderId!='' "  v-hasPermi="['store:storeOrder:getEroOrder']"  >
+            <el-button size="mini" @click="showErpOrder()" >查看ERP订单信息</el-button>
+          </div>
+          <div class="operate-button-container" v-if="order.isPayRemain!=null&&order.isPayRemain==1"  v-hasPermi="['store:storeOrder:auditPayRemain']"  >
+            <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
+          </div>
+          <!--        <div class="operate-button-container" >-->
+          <!--          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流</el-button>-->
+          <!--        </div>-->
+          <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
+            <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
+          </div>
+          <!-- <div class="operate-button-container" v-show="order.status===2">
+            <el-button size="mini"  >去发货</el-button>
+            <el-button size="mini" >备注订单</el-button>
+          </div>
+          <div class="operate-button-container" v-show="order.status===4">
+            <el-button size="mini"  >订单跟踪</el-button>
+            <el-button size="mini"  disabled>备注订单</el-button>
+          </div> -->
         </div>
-<!--        <div class="operate-button-container" >-->
-<!--          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流</el-button>-->
-<!--        </div>-->
-        <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
-          <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
+        <div style="margin: 20px 0px">
+          <span class="font-small">基本信息</span>
         </div>
-        <!-- <div class="operate-button-container" v-show="order.status===2">
-          <el-button size="mini"  >去发货</el-button>
-          <el-button size="mini" >备注订单</el-button>
-        </div>
-        <div class="operate-button-container" v-show="order.status===4">
-          <el-button size="mini"  >订单跟踪</el-button>
-          <el-button size="mini"  disabled>备注订单</el-button>
-        </div> -->
-      </div>
-      <div style="margin: 20px 0px">
-        <span class="font-small">基本信息</span>
-      </div>
-      <el-descriptions :column="4" border  >
-            <el-descriptions-item label="订单编号"  >
+        <el-descriptions :column="4" border  >
+          <el-descriptions-item label="订单编号"  >
                 <span v-if="order!=null">
                   {{order.orderCode}}
                 </span>
-                <el-tag  v-for="(item, index) in createTypeOptions"    v-if="order!=null&&order.orderCreateType==item.dictValue">{{item.dictLabel}}
-                </el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="会员"  >
+            <el-tag  v-for="(item, index) in createTypeOptions"    v-if="order!=null&&order.orderCreateType==item.dictValue">{{item.dictLabel}}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="会员"  >
                 <span v-if="user!=null">
                   {{user.nickname}}({{user.phone}})
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="支付方式"  >
-              <el-tag prop="payType" v-for="(item, index) in payTypeOptions"    v-if="order!=null&&order.payType==item.dictValue">{{item.dictLabel}}
-              </el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="订单类型"  >
-              <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
-            </el-descriptions-item>
-<!--            <el-descriptions-item label="物流公司编号"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliverySn}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流公司名称"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliveryName}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流单号"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  {{order.deliveryId}}-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流状态"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryStatusOptions"    v-if="order!=null&&order.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-<!--            <el-descriptions-item label="物流跟踪状态"  >-->
-<!--                <span v-if="order!=null">-->
-<!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryTypeOptions"    v-if="order!=null&&order.deliveryType==item.dictValue">{{item.dictLabel}}</el-tag>-->
-<!--                </span>-->
-<!--            </el-descriptions-item>-->
-            <el-descriptions-item label="物流结算费用"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="支付方式"  >
+            <el-tag prop="payType" v-for="(item, index) in payTypeOptions"    v-if="order!=null&&order.payType==item.dictValue">{{item.dictLabel}}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="订单类型"  >
+            <el-tag prop="orderType" v-for="(item, index) in orderTypeOptions"    v-if="order!=null&&order.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
+          </el-descriptions-item>
+          <!--            <el-descriptions-item label="物流公司编号"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  {{order.deliverySn}}-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <!--            <el-descriptions-item label="物流公司名称"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  {{order.deliveryName}}-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <!--            <el-descriptions-item label="物流单号"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  {{order.deliveryId}}-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <!--            <el-descriptions-item label="物流状态"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryStatusOptions"    v-if="order!=null&&order.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <!--            <el-descriptions-item label="物流跟踪状态"  >-->
+          <!--                <span v-if="order!=null">-->
+          <!--                  <el-tag prop="deliveryId" v-for="(item, index) in deliveryTypeOptions"    v-if="order!=null&&order.deliveryType==item.dictValue">{{item.dictLabel}}</el-tag>-->
+          <!--                </span>-->
+          <!--            </el-descriptions-item>-->
+          <el-descriptions-item label="物流结算费用"  >
                 <span v-if="order!=null&&order.deliveryPayMoney!=null ">
                   {{order.deliveryPayMoney.toFixed(2) }}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="快递帐单日期"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="快递帐单日期"  >
                 <span v-if="order!=null ">
                   {{order.deliveryTime }}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="快递结算日期"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="快递结算日期"  >
                 <span v-if="order!=null ">
                   {{order.deliveryPayTime }}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="推广佣金"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="推广佣金"  >
                 <span v-if="order!=null ">
                   {{order.tuiMoney }}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="收货人"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="收货人"  >
                 <span v-if="order!=null ">
-                  {{order.realName }}
+                  {{order.userName }}
                 </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="手机号码"  >
+          </el-descriptions-item>
+          <el-descriptions-item label="手机号码"  >
                 <span v-if="order!=null ">
                   {{order.userPhone }}
                 </span>
-                <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryPhone']"></el-button>
-            </el-descriptions-item>
-            <el-descriptions-item label="收货地址"  >
-              <el-popover
-                v-if="order!=null"
-                placement="top-start"
-                title="收货地址"
-                width="300"
-                trigger="hover"
-                :content="order.userAddress">
-                <span slot="reference">{{order.userAddress}}</span>
-                <el-button icon="el-icon-search" size="mini" @click="handleAddress()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryAddress']"></el-button>
-              </el-popover>
-            </el-descriptions-item>
-            <el-descriptions-item label="档期归属"  >
-              <el-tag prop="scheduleId" v-for="(item, index) in scheduleOptions"    v-if="order!=null&&order.scheduleId==item.id">{{item.name}}
-              </el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="用户备注"  >
+            <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryPhone']"></el-button>
+          </el-descriptions-item>
+          <el-descriptions-item label="收货地址"  >
+            <el-popover
+              v-if="order!=null"
+              placement="top-start"
+              title="收货地址"
+              width="300"
+              trigger="hover"
+              :content="order.userAddress">
+              <span slot="reference">{{order.userAddress}}</span>
+              <el-button icon="el-icon-search" size="mini" @click="handleAddress()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryAddress']"></el-button>
+            </el-popover>
+          </el-descriptions-item>
+          <el-descriptions-item label="档期归属"  >
+            <el-tag prop="scheduleId" v-for="(item, index) in scheduleOptions"    v-if="order!=null&&order.scheduleId==item.id">{{item.name}}
+            </el-tag>
+          </el-descriptions-item>
+          <el-descriptions-item label="用户备注"  >
                 <span v-if="order!=null">
                   {{order.mark}}
                 </span>
-            </el-descriptions-item>
-      </el-descriptions>
+          </el-descriptions-item>
+        </el-descriptions>
         <div style="margin-top: 20px">
           <span class="font-small">物流信息</span>
           &nbsp;
@@ -206,12 +206,12 @@
             </template>
           </el-table-column>
         </el-table>
-      <div style="margin: 20px 0px"  v-if="order!=null">
+        <div style="margin: 20px 0px"  v-if="order!=null">
         <span class="font-small">
           凭证信息
         </span>
-      </div>
-      <el-image
+        </div>
+        <el-image
           v-if="certificates != null"
           :src="certificates"
           :preview-src-list="[certificates]"
@@ -221,73 +221,73 @@
         <el-dialog :visible.sync="dialogVisibleImage" width="10%">
           <img :src="certificates" style="width: 100%" alt="">
         </el-dialog>
-      <div style="margin-top: 20px">
-        <span class="font-small">商品信息</span>
-      </div>
-      <el-table
-        border
-        v-if="items!=null"
-        :data="items"
-        size="small"
-        style="width: 100%;margin-top: 20px" >
-        <el-table-column label="商品图片" width="150" align="center">
-          <template slot-scope="scope">
-            <img :src="JSON.parse(scope.row.jsonInfo).image" style="height: 80px">
-          </template>
-        </el-table-column>
-        <el-table-column label="商品编码" width="300" align="center">
-          <template slot-scope="scope">
-            <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品组合编码" width="300" align="center">
-          <template slot-scope="scope">
-            <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="所属仓库" width="300" align="center">
-          <template slot-scope="scope">
-            <p>{{scope.row.warehouseCode}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" width="300" align="center">
-          <template slot-scope="scope">
-            <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="单价" width="240" align="center">
-          <template slot-scope="scope">
-            <p>￥{{JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}</p>
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" width="240" align="center">
-          <template slot-scope="scope">
-            {{JSON.parse(scope.row.jsonInfo).sku}}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" width="180" align="center">
-          <template slot-scope="scope">
-            {{scope.row.num}}
-          </template>
-        </el-table-column>
-        <el-table-column label="处方药" width="240" align="center">
-          <template slot-scope="scope">
-            {{scope.row.isPrescribe!=null&&scope.row.isPrescribe==1?'是':'否'}}
-          </template>
-        </el-table-column>
-        <el-table-column label="小计"  align="center">
-          <template slot-scope="scope" >
-            ￥{{scope.row.num*JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="float: right;margin: 20px" v-if="order!=null">
-        合计：<span class="color-danger">￥{{order.totalPrice.toFixed(2)}}</span>
-      </div>
-      <div style="margin: 60px 0px 20px 0px">
-        <span class="font-small">费用信息</span>
-      </div>
-      <el-descriptions   :column="4" border  >
+        <div style="margin-top: 20px">
+          <span class="font-small">商品信息</span>
+        </div>
+        <el-table
+          border
+          v-if="items!=null"
+          :data="items"
+          size="small"
+          style="width: 100%;margin-top: 20px" >
+          <el-table-column label="商品图片" width="150" align="center">
+            <template slot-scope="scope">
+              <img :src="JSON.parse(scope.row.jsonInfo).image" style="height: 80px">
+            </template>
+          </el-table-column>
+          <el-table-column label="商品编码" width="300" align="center">
+            <template slot-scope="scope">
+              <p>{{JSON.parse(scope.row.jsonInfo).barCode}}</p>
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="商品组合编码" width="300" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              <p>{{JSON.parse(scope.row.jsonInfo).groupBarCode}}</p>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="所属仓库" width="300" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              <p>{{scope.row.warehouseCode}}</p>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="商品名称" width="300" align="center">
+            <template slot-scope="scope">
+              <p>{{JSON.parse(scope.row.jsonInfo).productName}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" width="240" align="center">
+            <template slot-scope="scope">
+              <p>￥{{JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格" width="240" align="center">
+            <template slot-scope="scope">
+              {{JSON.parse(scope.row.jsonInfo).sku}}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" width="180" align="center">
+            <template slot-scope="scope">
+              {{scope.row.num}}
+            </template>
+          </el-table-column>
+<!--          <el-table-column label="处方药" width="240" align="center">-->
+<!--            <template slot-scope="scope">-->
+<!--              {{scope.row.isPrescribe!=null&&scope.row.isPrescribe==1?'是':'否'}}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="小计"  align="center">
+            <template slot-scope="scope" >
+              ￥{{scope.row.num*JSON.parse(scope.row.jsonInfo).price.toFixed(2)}}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="float: right;margin: 20px" v-if="order!=null">
+          合计：<span class="color-danger">￥{{order.totalPrice.toFixed(2)}}</span>
+        </div>
+        <div style="margin: 60px 0px 20px 0px">
+          <span class="font-small">费用信息</span>
+        </div>
+        <el-descriptions   :column="4" border  >
           <el-descriptions-item label="商品合计"  >
               <span v-if="order!=null">
                 ￥{{order.totalPrice.toFixed(2)}}
@@ -303,16 +303,16 @@
                 ￥{{order.payPostage.toFixed(2)}}
               </span>
           </el-descriptions-item>
-          <el-descriptions-item label="优惠券"  >
-              <span v-if="order!=null">
-                ￥{{order.couponPrice.toFixed(2)}}
-              </span>
-          </el-descriptions-item>
-          <el-descriptions-item label="积分抵扣"  >
-              <span v-if="order!=null">
-                ￥{{order.deductionPrice.toFixed(2)}}
-              </span>
-          </el-descriptions-item>
+<!--          <el-descriptions-item label="优惠券"  >-->
+<!--              <span v-if="order!=null">-->
+<!--                ￥{{order.couponPrice.toFixed(2)}}-->
+<!--              </span>-->
+<!--          </el-descriptions-item>-->
+<!--          <el-descriptions-item label="积分抵扣"  >-->
+<!--              <span v-if="order!=null">-->
+<!--                ￥{{order.deductionPrice.toFixed(2)}}-->
+<!--              </span>-->
+<!--          </el-descriptions-item>-->
           <el-descriptions-item label="实付金额"  >
               <span v-if="order!=null">
                 ￥{{order.payMoney.toFixed(2)}}
@@ -330,16 +330,16 @@
               </span>
           </el-descriptions-item>
 
-      </el-descriptions>
+        </el-descriptions>
 
-      <div style="margin-top: 20px">
-        <span class="font-small">支付信息</span>
-      </div>
-      <el-table
-        border
-        :data="payments"
-        size="small"
-        style="width: 100%;margin-top: 20px" >
+        <div style="margin-top: 20px">
+          <span class="font-small">支付信息</span>
+        </div>
+        <el-table
+          border
+          :data="payments"
+          size="small"
+          style="width: 100%;margin-top: 20px" >
           <el-table-column label="支付单号" align="center" prop="payCode" width="120px" />
           <el-table-column label="支付金额" align="center" prop="payMoney" />
           <el-table-column label="类型" align="center" prop="payTypeCode" />
@@ -347,79 +347,79 @@
           <el-table-column label="银行单号" align="center" prop="bankSerialNo" />
           <el-table-column label="创建时间" align="center" prop="createTime" />
           <el-table-column label="支付时间" align="center" prop="payTime" />
-      </el-table>
+        </el-table>
 
 
-      <div style="margin-top: 20px">
-        <span class="font-small">操作信息</span>
-      </div>
-      <el-table style="margin-top: 20px;width: 100%"
-                ref="orderHistoryTable"
-                :data="logs" border>
-        <el-table-column label="操作时间"  width="160" align="center">
-          <template slot-scope="scope">
-            {{scope.row.changeTime}}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{scope.row.changeMessage}}
-          </template>
-        </el-table-column>
-      </el-table>
+        <div style="margin-top: 20px">
+          <span class="font-small">操作信息</span>
+        </div>
+        <el-table style="margin-top: 20px;width: 100%"
+                  ref="orderHistoryTable"
+                  :data="logs" border>
+          <el-table-column label="操作时间"  width="160" align="center">
+            <template slot-scope="scope">
+              {{scope.row.changeTime}}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              {{scope.row.changeMessage}}
+            </template>
+          </el-table-column>
+        </el-table>
 
-      <div style="margin-top: 20px">
-        <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
-        <span class="font-small">分佣信息</span>
-      </div>
-      <el-table
-        border
-        :data="tuiMoneyLogs"
-        size="small"
-                style="width: 100%;margin-top: 20px" >
+        <div style="margin-top: 20px">
+          <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
+          <span class="font-small">分佣信息</span>
+        </div>
+        <el-table
+          border
+          :data="tuiMoneyLogs"
+          size="small"
+          style="width: 100%;margin-top: 20px" >
           <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
           <el-table-column label="金额" align="center" prop="money" />
           <el-table-column label="余额" align="center" prop="balance" />
           <el-table-column label="创建时间" align="center" prop="createTime" />
           <el-table-column label="备注" align="center" prop="remark" />
-      </el-table>
+        </el-table>
       </el-card>
     </div>
 
     <el-dialog :title="edit.title" :visible.sync="edit.open" width="600px" append-to-body>
       <el-form ref="editForm" :model="editForm" :rules="editRules" label-width="100px">
         <el-form-item label="订单类型" prop="orderType"  >
-            <el-select style="width: 200px" v-model="editForm.orderType" placeholder="请选择订单类型" clearable size="small" >
-              <el-option
-                      v-for="item in orderTypeOptions"
-                      :key="item.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    />
-            </el-select>
+          <el-select style="width: 200px" v-model="editForm.orderType" placeholder="请选择订单类型" clearable size="small" >
+            <el-option
+              v-for="item in orderTypeOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
         </el-form-item>
-       <el-form-item label="状态" prop="status" >
-           <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
+        <el-form-item label="状态" prop="status" >
+          <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
             <el-option key="0"  label="待支付" value="0" />
             <el-option key="1"  label="待发货" value="1" />
-             <el-option key="2"  label="待收货" value="2" />
-             <el-option key="3"  label="交易成功" value="3" />
-             <el-option key="-1"  label="退款中" value="-1" />
-             <el-option key="-2"  label="已退款" value="-2" />
-             <el-option key="-3"  label="已取消" value="-3" />
-           </el-select>
-         </el-form-item>
-         <el-form-item label="档期归属" prop="scheduleId"  >
-            <el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
-              <el-option
-                      v-for="item in scheduleOptions"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-            </el-select>
+            <el-option key="2"  label="待收货" value="2" />
+            <el-option key="3"  label="交易成功" value="3" />
+            <el-option key="-1"  label="退款中" value="-1" />
+            <el-option key="-2"  label="已退款" value="-2" />
+            <el-option key="-3"  label="已取消" value="-3" />
+          </el-select>
         </el-form-item>
-         <el-form-item label="详情地址" prop="userAddress"  >
+        <el-form-item label="档期归属" prop="scheduleId"  >
+          <el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
+            <el-option
+              v-for="item in scheduleOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="详情地址" prop="userAddress"  >
           <el-input v-model="editForm.userAddress" placeholder="请输入" />
         </el-form-item>
         <!-- <el-form-item label="erp单号" prop="extendOrderId"  >
@@ -436,9 +436,9 @@
 
     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body>
       <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="120px">
-      <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
-        <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button>
-      </div>
+        <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
+          <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button>
+        </div>
         <el-form-item label="物流公司" prop="deliverySn" >
           <el-select style="width:220px" v-model="editDyForm.deliverSn" placeholder="请选择" clearable size="small">
             <el-option v-for="item in deliveryOptions" :key="item.key" :label="item.label" :value="item.value" />
@@ -467,7 +467,7 @@
             {{scope.row.AcceptTime}}
           </template>
         </el-table-column>
-         <el-table-column label="位置" align="center">
+        <el-table-column label="位置" align="center">
           <template slot-scope="scope">
             {{scope.row.Location}}
           </template>
@@ -533,87 +533,110 @@
 </template>
 
 <script>
-import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp,getStoreOrderAddress,getStoreOrderPhone} from "@/api/store/storeOrder";
-import { getTcmScheduleList } from "@/api/company/schedule";
-import {getByOrderId, getExpressByDeliverId} from "../../../api/store/express";
+import {
+  auditPayRemain,
+  addTuiMoney,
+  syncExpressB,
+  updateExpress,
+  getEroOrder,
+  refundOrderMoney,
+  editTuiMoney,
+  getExpress,
+  finishOrder,
+  listStoreOrder,
+  getLiveOrderAll,
+  delStoreOrder,
+  addStoreOrder,
+  updateLiveOrder,
+  exportStoreOrder,
+  updateDeliveryId,
+  createErpOrder,
+  updateErp,
+  getLiveOrderAddress,
+  getUserPhone,
+  getByOrderId,
+  getExpressByDeliverId
+} from "@/api/live/liveOrder";
+import {getTcmScheduleList} from "@/api/company/schedule";
+
 export default {
   name: "order",
   data() {
     return {
       dialogVisibleImage: false,
-      createTypeOptions:[],
-      deliveryStatusOptions:[],
-      deliveryTypeOptions:[],
-      scheduleOptions:[],
-      schedules:[],
-      orderId:null,
-      erpDialog:{
-        title:"ERP订单信息",
-        open:false,
+      createTypeOptions: [],
+      deliveryStatusOptions: [],
+      deliveryTypeOptions: [],
+      scheduleOptions: [],
+      schedules: [],
+      orderId: null,
+      erpDialog: {
+        title: "ERP订单信息",
+        open: false,
       },
-      expressDialog:{
-        title:"物流信息",
-        open:false,
+      expressDialog: {
+        title: "物流信息",
+        open: false,
       },
-      edit:{
-        title:"",
-        open:false,
+      edit: {
+        title: "",
+        open: false,
       },
-      editDy:{
-        title:"修改物流单号",
-        open:false,
+      editDy: {
+        title: "修改物流单号",
+        open: false,
       },
-      editDyForm:{
+      editDyForm: {
         id: null,
         orderId: null,
-        deliverSn:null,
-        deliverName:null,
-        deliverId:null,
+        deliverSn: null,
+        deliverName: null,
+        deliverId: null,
       },
       deliveryOptions: [
-        { key: "SF", label: "顺丰", value: "SF" },
-        { key: "EMS", label: "邮政", value: "EMS" },
-        { key: "ZTO", label: "中通", value: "ZTO" },
-        { key: "JD", label: "京东", value: "JD" },
-        { key: "DBL", label: "德邦", value: "DBL" }
+        {key: "SF", label: "顺丰", value: "SF"},
+        {key: "EMS", label: "邮政", value: "EMS"},
+        {key: "ZTO", label: "中通", value: "ZTO"},
+        {key: "JD", label: "京东", value: "JD"},
+        {key: "DBL", label: "德邦", value: "DBL"}
       ],
-      editForm:{
-        orderType:null,
-        status:null,
-        userAddress:null,
+      editForm: {
+        orderType: null,
+        status: null,
+        userAddress: null,
         // extendOrderId:null,
-        scheduleId:null,
-        mark:"",
+        scheduleId: null,
+        mark: "",
       },
 
-      editDyRules:{
+      editDyRules: {
         deliverSn: [
-          { required: true, message: "物流公司不能为空", trigger: "blur" }
+          {required: true, message: "物流公司不能为空", trigger: "blur"}
         ],
         deliverId: [
-          { required: true, message: "物流单号不能为空", trigger: "blur" }
+          {required: true, message: "物流单号不能为空", trigger: "blur"}
         ],
       },
-      editRules:{
+      editRules: {
         userAddress: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
+          {required: true, message: "收货地址不能为空", trigger: "blur"}
         ],
 
       },
-      orderTypeOptions:[],
-      payTypeOptions:[],
-      statusOptions:[],
-      certificates:null,
-      orderStatus:null,
-      order:null,
-      user:{},
-      logs:[],
-      items:[],
-      express:null,
-      traces:[],
-      payments:[],
-      tuiMoneyLogs:[],
-      erpOrder:null,
+      orderTypeOptions: [],
+      payTypeOptions: [],
+      statusOptions: [],
+      certificates: null,
+      orderStatus: null,
+      order: null,
+      user: {},
+      logs: [],
+      items: [],
+      express: null,
+      traces: [],
+      payments: [],
+      tuiMoneyLogs: [],
+      erpOrder: null,
       deliverList: []
     };
   },
@@ -653,94 +676,97 @@ export default {
     }
   },
   methods: {
-    deliveryStatus(val){
-      return this.deliveryStatusOptions.filter(e=>e.dictValue === val)[0].dictLabel;
+    deliveryStatus(val) {
+      return this.deliveryStatusOptions.filter(e => e.dictValue === val)[0].dictLabel;
     },
-    getExpressList(){
-      getByOrderId(this.orderId).then(res=>{
-        this.deliverList = res.data;
+    getExpressList() {
+      getByOrderId(this.orderId).then(res => {
+        this.deliverList.push(res.data);
+      })
+    },
+    handleAddress() {
+      const id = this.order.orderId;
+      getLiveOrderAddress(id).then(response => {
+        this.order.userAddress = response.address;
+      })
+    },
+    handlePhone() {
+      const id = this.order.orderId;
+      getUserPhone(id).then(response => {
+        this.order.userPhone = response.userPhone;
       })
     },
-    handleAddress(){
-        const id = this.order.id;
-        getStoreOrderAddress(id).then(response =>{
-            this.order.userAddress = response.address;
-        })
-      },
-      handlePhone(){
-        const id = this.order.id;
-        getStoreOrderPhone(id).then(response =>{
-            this.order.userPhone = response.userPhone;
-        })
-      },
     showImageDialog() {
       this.dialogVisible = true;
     },
-    syncExpress(){
-      var that=this;
-        this.$confirm('确定同步物流状态吗', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return syncExpress(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    syncExpress() {
+      var that = this;
+      this.$confirm('确定同步物流状态吗', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return syncExpressB(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    updateErpOrder(){
-      var that=this;
-        this.$confirm('确定同步物流单号信息吗', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return updateErp(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-          this.editDy.open = false
-        }).catch(function() {});
+    updateErpOrder() {
+      var that = this;
+      this.$confirm('确定同步物流单号信息吗', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return updateErp(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+        this.editDy.open = false
+      }).catch(function () {
+      });
     },
-    updateExpress(){
-      var that=this;
-        this.$confirm('确定同步物流信息吗，同步后将自动发货', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return updateExpress(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    updateExpress() {
+      var that = this;
+      this.$confirm('确定同步物流信息吗，同步后将自动发货', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return updateExpress(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    showErpOrder(){
-      this.erpDialog.open=true;
-      var data={extendOrderId:this.order.extendOrderId};
+    showErpOrder() {
+      this.erpDialog.open = true;
+      var data = {extendOrderId: this.order.extendOrderId};
       getEroOrder(data).then(response => {
-          this.erp = response.data;
-          if(response.data.orders!=null&&response.data.orders.length==1){
-            this.erpOrder=response.data.orders[0]
-          }
-          console.log(this.erpOrder)
+        this.erp = response.data;
+        if (response.data.orders != null && response.data.orders.length == 1) {
+          this.erpOrder = response.data.orders[0]
+        }
+        console.log(this.erpOrder)
 
       });
     },
-    showExpress(scope){
-      this.expressDialog.open=true;
+    showExpress(scope) {
+      this.expressDialog.open = true;
       getExpressByDeliverId({
         orderId: this.orderId,
         deliverId: scope.row.deliverId,
         deliverSn: scope.row.deliverSn
       }).then(response => {
         this.express = response.data;
-        if(this.express!=null&&this.express.Traces!=null){
-          this.traces=this.express.Traces
+        if (this.express != null && this.express.Traces != null) {
+          this.traces = this.express.Traces
         }
       })
       // getExpress(this.orderId).then(response => {
@@ -752,186 +778,193 @@ export default {
       // });
 
     },
-    submitEditForm(){
-        this.$refs["editForm"].validate(valid => {
+    submitEditForm() {
+      this.$refs["editForm"].validate(valid => {
         if (valid) {
-          updateStoreOrder(this.editForm).then(response => {
+          updateLiveOrder(this.editForm).then(response => {
             if (response.code === 200) {
               this.msgSuccess("操作成功");
               this.edit.open = false;
-              this.getOrder(this.order.id);
+              this.getOrder(this.order.orderId);
             }
           });
 
         }
       });
     },
-    submitEditDyForm(){
-        this.$refs["editDyForm"].validate(valid => {
+    submitEditDyForm() {
+      this.$refs["editDyForm"].validate(valid => {
         if (valid) {
           // 如果没有id就表明是添加物流信息
-            updateDeliveryId(this.editDyForm).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("操作成功");
-                this.editDy.open = false;
-                this.getOrder(this.order.id);
-              }
-            }).finally(()=>{
-              this.editDyForm.deliverSn=null;
-              this.editDyForm.deliverId=null;
-              this.editDyForm.deliverName=null;
-            })
+          updateDeliveryId(this.editDyForm).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess("操作成功");
+              this.editDy.open = false;
+              this.getOrder(this.order.orderId);
+            }
+          }).finally(() => {
+            this.editDyForm.deliverSn = null;
+            this.editDyForm.deliverId = null;
+            this.editDyForm.deliverName = null;
+          })
         }
       });
     },
-    editTuiMoney1(){
-      var that=this;
-        this.$confirm('是否冻结此订单推广佣金吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return editTuiMoney(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    editTuiMoney1() {
+      var that = this;
+      this.$confirm('是否冻结此订单推广佣金吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return editTuiMoney(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    editTuiMoney2(){
-      var that=this;
-        this.$confirm('是否解冻此订单推广佣金吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return editTuiMoney(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    editTuiMoney2() {
+      var that = this;
+      this.$confirm('是否解冻此订单推广佣金吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return editTuiMoney(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    addTuiMoney(){
-      var that=this;
-        this.$confirm('确定手动分佣金吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return addTuiMoney(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    addTuiMoney() {
+      var that = this;
+      this.$confirm('确定手动分佣金吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return addTuiMoney(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    refundOrderMoney(){
-        var that=this;
-        this.$confirm('确认退款吗', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return refundOrderMoney(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    refundOrderMoney() {
+      var that = this;
+      this.$confirm('确认退款吗', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return refundOrderMoney(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    finishOrder(){
-        var that=this;
-        this.$confirm('是否确认客户已收货?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return finishOrder(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    finishOrder() {
+      var that = this;
+      this.$confirm('是否确认客户已收货?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return finishOrder(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    auditPayRemain(){
-        var that=this;
-        this.$confirm('是否确认已收尾款?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderId:that.order.id}
-          return auditPayRemain(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    auditPayRemain() {
+      var that = this;
+      this.$confirm('是否确认已收尾款?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderId: that.order.orderId}
+        return auditPayRemain(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    editOrder(){
-        this.edit.open=true;
-        this.editForm.id=this.order.id;
-        this.editForm.mark=this.order.mark
-        this.editForm.orderType=this.order.orderType.toString();
-        this.editForm.status = this.order.status.toString();
-        this.editForm.userAddress = this.order.userAddress.toString();
-        this.editForm.scheduleId = this.order.scheduleId;
-        // this.editForm.extendOrderId = this.order.extendOrderId.toString();
+    editOrder() {
+      this.edit.open = true;
+      this.editForm.id = this.order.orderId;
+      this.editForm.mark = this.order.mark
+      this.editForm.orderType = this.order.orderType.toString();
+      this.editForm.status = this.order.status.toString();
+      this.editForm.userAddress = this.order.userAddress.toString();
+      this.editForm.scheduleId = this.order.scheduleId;
+      // this.editForm.extendOrderId = this.order.extendOrderId.toString();
 
     },
     //推送管易按钮
-    addErpOrder(){
-        var that=this;
-        this.$confirm('是否确认推送管易?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          var data={orderCode:that.order.orderCode}
-          return createErpOrder(data);
-        }).then(() => {
-          this.msgSuccess("操作成功");
-          this.getOrder(this.order.id);
-        }).catch(function() {});
+    addErpOrder() {
+      var that = this;
+      this.$confirm('是否确认推送管易?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        var data = {orderCode: that.order.orderCode}
+        return createErpOrder(data);
+      }).then(() => {
+        this.msgSuccess("操作成功");
+        this.getOrder(this.order.orderId);
+      }).catch(function () {
+      });
     },
-    editDelivery(scope){
+    editDelivery(scope) {
       this.editDy.open = true;
-      this.editDyForm.orderId = this.order.id;
-      if(scope) {
+      this.editDyForm.orderId = this.order.orderId;
+      if (scope) {
         this.editDyForm.id = scope.row.id;
         this.editDyForm.deliverId = scope.row.deliverId;
         this.editDyForm.deliverSn = scope.row.deliverSn;
       } else {
-        this.editDyForm.deliverSn=null;
-        this.editDyForm.deliverId=null;
-        this.editDyForm.deliverName=null;
+        this.editDyForm.deliverSn = null;
+        this.editDyForm.deliverId = null;
+        this.editDyForm.deliverName = null;
       }
     },
-    getOrder(orderId){
-        this.orderId=orderId;
-        this.certificates = null;
-        getStoreOrder(orderId).then(response => {
-            this.order = response.order;
-            if(response.order.certificates != null){
-              this.certificates = response.order.certificates;
-            }
-            if(response.order.status != null){
-              this.orderStatus = response.order.status;
-            }
-            this.user = response.user;
-            this.logs = response.logs;
-            this.items = response.items;
-            this.payments=response.payments;
-            this.tuiMoneyLogs=response.tuiMoneyLogs;
-        });
+    getOrder(orderId) {
+      this.orderId = orderId;
+      this.certificates = null;
+      getLiveOrderAll(orderId).then(response => {
+        this.order = response.order;
+        if (response.order.certificates != null) {
+          this.certificates = response.order.certificates;
+        }
+        if (response.order.status != null) {
+          this.orderStatus = response.order.status;
+        }
+        this.user = response.user;
+        this.logs = response.logs;
+        this.items = response.items;
+        this.payments = response.payments;
+        this.tuiMoneyLogs = response.tuiMoneyLogs;
+      });
 
-        this.getExpressList();
-     }
+      this.getExpressList();
+    }
   }
 };
 </script>
 <style scoped>
-.order-content{
+.order-content {
   margin: 10px;
 
 }

src/views/live/liveAfteraSales/index.vue

@@ -301,7 +301,7 @@ export default {
       this.title="售后订单"
       this.open=true;
       setTimeout(() => {
-        this.$refs.afterSalesOrder.getStoreAfterSales(row.id);
+        this.$refs.afterSalesOrder.getLiveAfterSales(row.id);
       }, 200);
     },
     /** 查询售后记录列表 */

src/views/live/liveOrder/liveOrderDetails.vue

@@ -59,9 +59,9 @@
 <!--            <el-button size="mini" @click="followMsg()" >随访记录</el-button>-->
 <!--          </div>-->
 
-<!--          <div class="operate-button-container" v-if="item.status>1">-->
-<!--            <el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:afterSales']">申请退款</el-button>-->
-<!--          </div>-->
+          <div class="operate-button-container" v-if="item.status>1">
+            <el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:refundOrderMoney']">申请退款</el-button>
+          </div>
 <!--          <div class="operate-button-container" v-if="item.status== -2" >-->
 <!--            <el-button size="mini" @click="returnCost()"  v-hasPermi="['his:liveOrder:returnCost']" >成本退还</el-button>-->
 <!--          </div>-->
@@ -262,7 +262,7 @@
 
 
 <script>
-import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder} from "@/api/live/liveOrder";
+import {getLiveOrder, syncExpress, updateLiveOrder, updateErp, getExpress, listOrderitem, tuiOrder,refundOrderMoney} from "@/api/live/liveOrder";
 
 
 export default {
@@ -658,12 +658,12 @@ export default {
         var data={
           orderId:that.item.orderId
         }
-        return afterSales(data);
+        return refundOrderMoney(data);
       }).then(() => {
         this.msgSuccess("操作成功");
         getLiveOrder(this.item.orderId).then(response => {
           this.item = response.data;
-          this.getlogList(this.item.orderId);
+          // this.getlogList(this.item.orderId);
           this.$parent.$parent.getList();
         });
       }).catch(function() {});