xdd

src/views/live/liveOrder/liveOrderDetails.vue

@@ -37,10 +37,10 @@
           <div class="operate-button-container" >
             <el-button size="mini" @click="editOrder()"  v-hasPermi="['his:liveOrder:edit']" >修改订单</el-button>
           </div>
-          <div class="operate-button-container" v-if="item.status ==2 && item.extendOrderId == null && item.deliverySn == null&&item.orderType==1"   v-hasPermi="['his:liveOrder:createErpOrder']">
+          <div class="operate-button-container" v-if="item.extendOrderId == null"  >
             <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
           </div>
-          <div class="operate-button-container" v-if="item.extendOrderId!=null && item.orderType==1"  v-hasPermi="['his:liveOrder:getEroOrder']"  >
+          <div class="operate-button-container" v-if="item.extendOrderId!=null"  >
             <el-button size="mini" @click="showErpOrder()" >ERP订单信息</el-button>
           </div>
           <div class="operate-button-container" v-if="item.status>1">
@@ -63,6 +63,7 @@
           <el-descriptions-item label="员工"><span v-if="item!=null">{{item.companyUserName}}</span></el-descriptions-item>
           <el-descriptions-item label="推广佣金" ><span v-if="item.tuiMoney!=null">{{item.tuiMoney.toFixed(2)}}</span></el-descriptions-item>
           <el-descriptions-item label="推广佣金状态" ><span v-if="item!=null"><dict-tag :options="tuiOptions" :value="item.tuiMoneyStatus"/> </span></el-descriptions-item>
+          <el-descriptions-item label="ERP编号" ><span v-if="item!=null">{{item.extendOrderId}}</span></el-descriptions-item>
           <el-descriptions-item label="用户备注" ><span v-if="item!=null">{{item.remark}}</span></el-descriptions-item>
           <el-descriptions-item label="档期归属" >
             <el-tag prop="scheduleId" v-for="(schedule, index) in scheduleOptions"    v-if="item!=null&&item.scheduleId==schedule.id">{{schedule.name}}
@@ -144,6 +145,11 @@
             <p>{{scope.row.barCode}}</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>{{scope.row.productName}}</p>
@@ -290,6 +296,55 @@
     </el-dialog>
 
 
+    <el-dialog :title="erpDialog.title" :visible.sync="erpDialog.open" width="600px" append-to-body>
+      <div v-if="order!=null&&order.extendOrderId!=null&&order.status==1"  v-hasPermi="['store:storeOrder:updateExpress']"  >
+        <el-button size="mini" @click="updateExpress()" >同步物流发货</el-button>
+      </div>
+      <div class="table-layout"  v-if="erpOrder!=null">
+        <el-row>
+          <el-col :span="6" class="table-cell-title">订单编号</el-col>
+          <el-col :span="6" class="table-cell-title">是否代收</el-col>
+          <el-col :span="6" class="table-cell-title">快递编号</el-col>
+          <el-col :span="6" class="table-cell-title">快递名称</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.code}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.cod?'是':'否'}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.express_code}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.express_name}}
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6" class="table-cell-title">收货人</el-col>
+          <el-col :span="6" class="table-cell-title">电话</el-col>
+          <el-col :span="6" class="table-cell-title">地址</el-col>
+          <el-col :span="6" class="table-cell-title">运单号</el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.receiver_name}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.receiver_mobile}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.receiver_address}}
+          </el-col>
+          <el-col :span="6" class="table-cell">
+            {{erpOrder.deliverys!=null&&erpOrder.deliverys.length>0?erpOrder.deliverys[0].mail_no:''}}
+          </el-col>
+
+        </el-row>
+      </div>
+    </el-dialog>
+
     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body>
       <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="100px">
         <div  v-hasPermi="['his:liveOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
@@ -355,7 +410,14 @@ import {
   listOrderitem,
   tuiOrder,
   refundOrderMoney,
-  editDeliveryId, finishOrder, getOrderExpress, getOrderPayments, getOrderLog, tuiMoneyLogs
+  editDeliveryId,
+  finishOrder,
+  getOrderExpress,
+  getOrderPayments,
+  getOrderLog,
+  tuiMoneyLogs,
+  updateExpress,
+  createErpOrder, getEroOrder
 } from "@/api/live/liveOrder";
 import {getStoreOrderLive} from "@/api/store/storeOrder";
 
@@ -680,8 +742,10 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        var data=that.item.orderId
-        return createErpOrder(data);
+        var data=that.item.orderCode
+        return createErpOrder({
+          orderCode: data
+        });
       }).then(() => {
         this.msgSuccess("操作成功");
         getLiveOrder(this.item.orderId).then(response => {
@@ -694,7 +758,9 @@ export default {
     showErpOrder(){
       this.erpDialog.open=true;
       var data=this.item.extendOrderId;
-      getEroOrder(data).then(response => {
+      getEroOrder({
+        extendOrderId: data
+      }).then(response => {
         this.erp = response.data;
         if(response.data.orders!=null&&response.data.orders.length==1){
           this.erpOrder=response.data.orders[0]