no message

src/api/orderManagement.js

@@ -8,6 +8,14 @@ export function esOrderList(params) {
   })
 }
 
+export function esOrderDetail(params) {
+  return request({
+    url: '/esOrder/detail',
+    method: 'post',
+    params
+  })
+}
+
 export function esOrderAdd(data) {
   return request({
     url: '/esOrder/add',
@@ -15,3 +23,52 @@ export function esOrderAdd(data) {
     data
   })
 }
+
+export function esOrderExpress(params) {
+  return request({
+    url: '/esOrder/express',
+    method: 'post',
+    params
+  })
+}
+
+export function esOrderRefund(params) {
+  return request({
+    url: '/esOrder/refund',
+    method: 'post',
+    params
+  })
+}
+
+export function esOrderPayPrice(params) {
+  return request({
+    url: '/esOrder/payPrice',
+    method: 'post',
+    params
+  })
+}
+
+export function esOrderListExcel(params) {
+  return request({
+    url: '/esOrder/listExcel',
+    method: 'post',
+    params
+  })
+}
+
+export function esOrderPayOk(params) {
+  return request({
+    url: '/esOrder/payOk',
+    method: 'post',
+    params
+  })
+}
+
+export function esOrderCancel(params) {
+  return request({
+    url: '/esOrder/cancel',
+    method: 'post',
+    params
+  })
+}
+

src/views/secondHandMall/orderManagement/add.vue

@@ -21,8 +21,63 @@ export default {
   data(){
     return {
       formData: {
-        imgSrc: [],
-        promotionQuestionnaireQrcodes: []
+        "area": "",
+        "brandName": "",
+        "city": "",
+        "companyName": "",
+        "companyWechatId": "",
+        "createBy": "",
+        "createTime": "",
+        "energyLabel": "",
+        "esCategoryId": "",
+        "esCategoryName": "",
+        "esGoodsId": "",
+        "esGoodsName": "",
+        "esOrderId": "",
+        "esOrderInfos": [],
+        "fileUrl": [],
+        "goodsNote": "",
+        "goodsPrice": 0,
+        "goodsUrl": "",
+        "logisticsCode": "",
+        "logisticsName": "",
+        "logisticsNo": "",
+        "num": 0,
+        "overTime": "",
+        "payStartTime": "",
+        "payTime": "",
+        "payType": "",
+        "pickType": "",
+        "power": "",
+        "productionTime": "",
+        "province": "",
+        "receAddress": "",
+        "refundNum": 0,
+        "refundPrice": 0,
+        "remark": "",
+        "saleType": 0,
+        "sellId": "",
+        "sellMobile": "",
+        "sellName": "",
+        "sellTime": "",
+        "sellUrl": "",
+        "sendName": "",
+        "sendTime": "",
+        "source": "",
+        "status": "",
+        "street": "",
+        "totalAmount": 0,
+        "transactionId": "",
+        "unit": "",
+        "updateBy": "",
+        "updateTime": "",
+        "userAddressId": "",
+        "userMobile": "",
+        "userName": "",
+        "wechatUserId": "",
+        "wechatUserMobile": "",
+        "wechatUserName": "",
+        "wechatUserUrl": "",
       }
     }
   },
@@ -32,46 +87,47 @@ export default {
         name: 'el-input',
         md: 6,
         attributes: { disabled: false },
-        formItemAttributes: { label: '商品分类', prop: 'categoryName' }
+        formItemAttributes: { label: '客户名称', prop: 'userName', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
       },{
         name: 'el-input',
         md: 6,
         attributes: { disabled: false },
-        formItemAttributes: { label: '商品分类', prop: 'categoryName' }
+        formItemAttributes: { label: '客户电话', prop: 'userMobile', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
       },{
         name: 'el-radio',
         options: [
-          { label: '一级能效', value: "一级能效" },
-          { label: '二级能效', value: "二级能效" },
+          { label: '现金支付', value: "CASH" },
+          { label: '转账支付', value: "TRANSFER" },
+          { label: '微信支付', value: "WECHAT" },
         ],
         md: 6,
         attributes: { disabled: this.disabled },
-        formItemAttributes: { label: '能效标识', prop: 'mark' }
+        formItemAttributes: { label: '支付方式', prop: 'payType', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
       },{
         name: 'el-radio',
         options: [
-          { label: '一级能效', value: "一级能效" },
-          { label: '五级能效', value: "五级能效" },
+          { label: '线上销售', value: 1 },
+          { label: '线下销售', value: 2 },
         ],
         md: 6,
         attributes: { disabled: this.disabled },
-        formItemAttributes: { label: '能效标识', prop: 'mark' }
-      },...this.amapRegion,{
+        formItemAttributes: { label: '销售方式', prop: 'saleType', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
+      }, ...this.amapRegion, {
         name: 'el-input',
         md: 24,
         attributes: { disabled: false, type:"textarea" },
-        formItemAttributes: { label: '备注', prop: 'categoryName' }
+        formItemAttributes: { label: '备注', prop: 'remark' }
       },{
         md: 24,
         name: 'slot-component',
         formItemAttributes: {
           label: '附件',
-          prop: 'imgSrc',
+          prop: 'fileUrl',
           rules: []
         },
         render: (h, { props, onInput }) => {
           return (
-            <ImageUpload fileList={this.formData.imgSrc} limit={100}/>
+            <ImageUpload fileList={this.formData.fileUrl} limit={100}/>
           )
         }
       }]
@@ -83,7 +139,7 @@ export default {
           formItemAttributes: {
             label: '',
             'label-width': '0px',
-            prop: 'promotionQuestionnaireQrcodes',
+            prop: 'esOrderInfos',
             rules: []
           },
           render: (h, { props, onInput }) => {
@@ -94,7 +150,7 @@ export default {
                 {
                   columnAttributes: {
                     label: '商品分类',
-                    prop: 'websitName'
+                    prop: 'esCategoryId'
                   },
                   editRender: (h, { row, column, index }) => {
                     return (
@@ -102,7 +158,7 @@ export default {
                         <el-form-item
                           label=""
                           label-width="0px"
-                          prop={`promotionQuestionnaireQrcodes.${index}.${column.columnAttributes.prop}`}
+                          prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
                           <el-input
@@ -123,7 +179,7 @@ export default {
                 {
                   columnAttributes: {
                     label: '商品名称',
-                    prop: 'websitName'
+                    prop: 'esGoodsId'
                   },
                   editRender: (h, { row, column, index }) => {
                     return (
@@ -131,7 +187,7 @@ export default {
                         <el-form-item
                           label=""
                           label-width="0px"
-                          prop={`promotionQuestionnaireQrcodes.${index}.${column.columnAttributes.prop}`}
+                          prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
                           <el-input
@@ -152,19 +208,19 @@ export default {
                 {
                   columnAttributes: {
                     label: '单位',
-                    prop: 'websitName'
+                    prop: 'unit'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '上架数量',
-                    prop: 'websitName'
+                    prop: 'sjNum'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '订单数量',
-                    prop: 'websitName'
+                    prop: 'num'
                   },
                   editRender: (h, { row, column, index }) => {
                     return (
@@ -172,7 +228,7 @@ export default {
                         <el-form-item
                           label=""
                           label-width="0px"
-                          prop={`promotionQuestionnaireQrcodes.${index}.${column.columnAttributes.prop}`}
+                          prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
                           <el-input
@@ -193,7 +249,7 @@ export default {
                 {
                   columnAttributes: {
                     label: '商品价格',
-                    prop: 'websitName'
+                    prop: 'goodsPrice'
                   },
                   editRender: (h, { row, column, index }) => {
                     return (
@@ -201,7 +257,7 @@ export default {
                         <el-form-item
                           label=""
                           label-width="0px"
-                          prop={`promotionQuestionnaireQrcodes.${index}.${column.columnAttributes.prop}`}
+                          prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
                           <el-input
@@ -222,31 +278,31 @@ export default {
                 {
                   columnAttributes: {
                     label: '金额',
-                    prop: 'websitName'
+                    prop: 'totalAmount'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '商品品牌',
-                    prop: 'websitName'
+                    prop: 'brandName'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '功率（W）',
-                    prop: 'websitName'
+                    prop: 'power'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '制造日期',
-                    prop: 'websitName'
+                    prop: 'productionTime'
                   }
                 },
                 {
                   columnAttributes: {
                     label: '能效标识',
-                    prop: 'websitName'
+                    prop: 'energyLabel'
                   }
                 },
               ],
@@ -257,21 +313,89 @@ export default {
               },
               {
                 add: () => {
-                  this.formData.promotionQuestionnaireQrcodes.push({
-                    websitName: '',
-                    qrcode: ''
+                  this.formData.esOrderInfos.push({
+                    "area": "",
+                    "brandName": "",
+                    "city": "",
+                    "companyName": "",
+                    "companyWechatId": "",
+                    "createBy": "",
+                    "createTime": "",
+                    "energyLabel": "",
+                    "esCategoryId": "",
+                    "esCategoryName": "",
+                    "esGoodsId": "",
+                    "esGoodsName": "",
+                    "esOrderId": "",
+                    "fileUrl": "",
+                    "goodsNote": "",
+                    "goodsPrice": "",
+                    "goodsUrl": "",
+                    "logisticsCode": "",
+                    "logisticsName": "",
+                    "logisticsNo": "",
+                    "num": "",
+                    "overTime": "",
+                    "payStartTime": "",
+                    "payTime": "",
+                    "payType": "",
+                    "pickType": "",
+                    "power": "",
+                    "productionTime": "",
+                    "province": "",
+                    "receAddress": "",
+                    "refundNum": 0,
+                    "refundPrice": 0,
+                    "remark": "",
+                    "saleType": 0,
+                    "sellId": "",
+                    "sellMobile": "",
+                    "sellName": "",
+                    "sellTime": "",
+                    "sellUrl": "",
+                    "sendName": "",
+                    "sendTime": "",
+                    "source": "",
+                    "status": "",
+                    "street": "",
+                    "totalAmount": "",
+                    "transactionId": "",
+                    "unit": "",
+                    "updateBy": "",
+                    "updateTime": "",
+                    "userAddressId": "",
+                    "userMobile": "",
+                    "userName": "",
+                    "wechatUserId": "",
+                    "wechatUserMobile": "",
+                    "wechatUserName": "",
+                    "wechatUserUrl": ""
+                  })
+                  this.isEditTableIndex = this.formData.esOrderInfos.length - 1
+                },
+                verify: ({ row, column, index }, isEditTableIndex) => {
+                  return new Promise(r => {
+                    if (isEditTableIndex > -1) {
+                      this.$refs.formRef.validateField(
+                        [
+                          `esOrderInfos.${isEditTableIndex}.esCategoryId`,
+                          `esOrderInfos.${isEditTableIndex}.esGoodsId`,
+                          `esOrderInfos.${isEditTableIndex}.num`,
+                          `esOrderInfos.${isEditTableIndex}.goodsPrice`,
+                        ],
+                        v => {
+                          if (v) {
+                            r(true)
+                          } else {
+                            r(false)
+                          }
+                        }
+                      )
+                    } else {
+                      r(true)
+                    }
                   })
-                  this.isEditTableIndex = this.formData.promotionQuestionnaireQrcodes.length - 1
                 },
-                // verify: ({ row, column, index }, isEditTableIndex) => {
-                //   return new Promise(r => {
-                //     if (isEditTableIndex > -1) {
-                //       r(true)
-                //     } else {
-                //       r(true)
-                //     }
-                //   })
-                // },
               }
             )
           }

src/views/secondHandMall/orderManagement/details.vue

@@ -7,7 +7,7 @@
             <el-row style="padding: 15px 15px 10px">
               <el-col :span="24">
                 <div class="order-main-title">
-                  <span>订单编号：{{ orderDetail.orderId }}</span>
+                  <span>订单编号：{{ orderDetail.esOrderId }}</span>
                   <span>下单时间：{{ orderDetail.createTime }}</span>
                 </div>
               </el-col>
@@ -15,52 +15,48 @@
             <div style="width: 100%; padding: 10px 15px 15px 15px">
               <el-row>
                 <el-col :span="10">
-                  <div style="display: flex;">
+                  <!--  -->
+                  <div v-if="detailsTypeCp==0" style="display: flex;">
                     <div>
                       <div class="order-main-status">
-                        <span>状态</span>
+                        <span>{{ ({SAVE: "买家下单", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "已退货/取消", WAIT_REFUND: "售后中"})[orderDetail.status] }}</span>
                       </div>
                       <div class="order-main-opt-btn">
                         <template>
-                          <el-popconfirm title="确定收款吗？">
-                            <el-button slot="reference" size="small">确认收款</el-button>
-                          </el-popconfirm>
-                          <el-button size="small" style="margin-left: 10px;">修改价格</el-button>
-                          <el-popconfirm title="确定取消订单吗？" style="margin-left: 10px;">
-                            <el-button slot="reference" size="small" type="danger">取消订单</el-button>
-                          </el-popconfirm>
+                          <el-button size="small" type="primary" @click="lookkuaidi">查看物流</el-button>
+                          <el-button size="small" type="primary" @click="detailsTypeCp = 2">退货退款</el-button>
                         </template>
                       </div>
                     </div>
                   </div>
-                  <div>
-                    <el-form ref="form" :model="form" label-width="80px" size="mini">
-                      <el-form-item label="处理结果">
-                        <el-radio-group v-model="form.resource">
-                          <el-radio label="仅退货"></el-radio>
-                          <el-radio label="仅退款"></el-radio>
-                          <el-radio label="退货退款"></el-radio>
+                  <!--  -->
+                  <div  v-if="detailsTypeCp==2">
+                    <el-form ref="formTHref" :model="formTH" label-width="80px" size="mini">
+                      <el-form-item label="处理结果" prop="refundType" :rules="[{ required: true, message: '请选择', trigger: 'blur' }]">
+                        <el-radio-group v-model="formTH.refundType">
+                          <el-radio label="GOODS">仅退货</el-radio>
+                          <el-radio label="REFUND">仅退款</el-radio>
+                          <el-radio label="GOODS_REFUND">退货退款</el-radio>
                         </el-radio-group>
                       </el-form-item>
-                      <el-form-item label="退货数量">
-                        <el-input v-model="form.name"></el-input>
+                      <el-form-item v-if="~['GOODS','GOODS_REFUND'].indexOf(formTH.refundType)" label="退货数量" prop="refundNum" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        <el-input v-model="formTH.refundNum"></el-input>
                       </el-form-item>
-                      <el-form-item label="退款金额">
-                        <el-input v-model="form.name"></el-input>
+                      <el-form-item v-if="~['REFUND','GOODS_REFUND'].indexOf(formTH.refundType)" label="退款金额" prop="refundPrice" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        <el-input v-model="formTH.refundPrice"></el-input>
                       </el-form-item>
                       <el-form-item label="备注">
-                        <el-input type="textarea" v-model="form.desc"></el-input>
+                        <el-input type="textarea" v-model="formTH.refundRemark"></el-input>
                       </el-form-item>
                     </el-form>
                   </div>
                 </el-col>
-                <el-col :span="14" style="padding-top: 10px;">
-                  <el-steps :active="-1" align-center>
-                    <el-step title="买家下单" :description="orderDetail.createTime"></el-step>
-                    <el-step title="买家付款" :description="orderDetail.payTime ? orderDetail.payTime : ''"></el-step>
-                    <el-step title="商家发货"
-                      :description="orderDetail.deliverTime ? orderDetail.deliverTime : ''"></el-step>
-                    <el-step title="交易成功" :description="orderDetail.overTime ? orderDetail.overTime : ''"></el-step>
+                <el-col  v-if="detailsTypeCp==0" :span="14" style="padding-top: 10px;">
+                  <el-steps :active="zhuangtai" align-center>
+                    <el-step title="买家下单" ></el-step>
+                    <el-step title="买家付款" ></el-step>
+                    <el-step title="卖家发货" ></el-step>
+                    <el-step title="交易成功" ></el-step>
                   </el-steps>
                 </el-col>
               </el-row>
@@ -74,12 +70,12 @@
                   <div class='info_title'>卖家信息</div>
                   <div class='info_bottom'>
                     <div class='info_bottom_lt'>
-                      <el-image style='width: 40px; height: 40px' src=""></el-image>
+                      <el-image style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
                     </div>
                     <div class='info_bottom_rt'>
-                      <div>微信昵称：{formData.userName}</div>
-                      <div>微信手机号：{formData.phone}</div>
-                      <div>发布时间：{formData.goodsCreateTime}</div>
+                      <div>昵称：{{orderDetail.sellName}}</div>
+                      <div>手机号：{{orderDetail.sellMobile}}</div>
+                      <div>发布时间：{{orderDetail.sellTime}}</div>
                     </div>
                   </div>
                 </div>
@@ -89,15 +85,15 @@
                   <div class='info_title'>买家信息</div>
                   <div class='info_bottom'>
                     <div class='info_bottom_lt'>
-                      <el-image style='width: 40px; height: 40px' src="">
+                      <el-image style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
                       </el-image>
                     </div>
                     <div class='info_bottom_rt'>
-                      <div>微信昵称：{formData.buyerUserName}</div>
-                      <div>微信手机号：{formData.buyerUserPhone}</div>
-                      <div>收货人信息：{formData.consigneeName}</div>
-                      <div>收货人地址：{formData.address}</div>
-                      <div>支付方式：{formData.payType === 'WECHAT'}</div>
+                      <div v-if="orderDetail.wechatUserName">昵称：{{orderDetail.wechatUserName}}</div>
+                      <div v-if="orderDetail.wechatUserMobile">手机号：{{orderDetail.wechatUserMobile}}</div>
+                      <div>收货人信息：({{orderDetail.userName}}){{orderDetail.userMobile}}</div>
+                      <div>收货人地址：{{ orderDetail.province + orderDetail.city + orderDetail.area + orderDetail.street + orderDetail.receAddress }}</div>
+                      <div>支付方式：{{({WECHAT:"微信支付", CASH:"现金支付", TRANSFER:"转账支付"})[orderDetail.payType]}}</div>
                     </div>
                   </div>
                 </div>
@@ -108,14 +104,14 @@
                   <div class='info_bottom'>
                     <div class='info_bottom_rt'>
                       <div>
-                        <el-radio-group value={formData.logisticsType}>
-                          <el-radio label='SELF'>自提</el-radio>
-                          <el-radio label='DELIVERY'>物流</el-radio>
+                        <el-radio-group disabled v-model="orderDetail.pickType">
+                          <el-radio label='YES'>自提</el-radio>
+                          <el-radio label='NO'>物流</el-radio>
                         </el-radio-group>
                       </div>
-                      <div>快递单号：{formData.logisticsNum}</div>
-                      <div>快递公司：{formData.logisticsName}</div>
-                      <el-button type='primary' size='small'>查看物流
+                      <div>快递单号：{{orderDetail.logisticsNo}}</div>
+                      <div>快递公司：{{orderDetail.logisticsName}}</div>
+                      <el-button v-if="detailsTypeCp==0 && orderDetail.logisticsCode && orderDetail.logisticsNo" type='primary' size='small' @click="lookkuaidi">查看物流
                       </el-button>
                     </div>
                   </div>
@@ -125,50 +121,44 @@
           </div>
 
           <h3>商品信息</h3>
-          <div class="order-detail">
+          <div class="order-main" style="border:none;">
             <!-- 订单表格 -->
-            <el-table :data="orderDetail.orderDetails" style="width: 100%" border>
+            <el-table :data="[orderDetail]" style="width: 100%" border>
               <el-table-column label="商品信息" min-width="200">
                 <template slot-scope="scope">
                   <el-row>
                     <el-col :span="6">
-                      <el-image style="width: 40px; height: 40px" :src="scope.row.imgUrl">
+                      <el-image style="width: 40px; height: 40px" :src="scope.row.goodsUrl">
                         <div slot="error" class="image-slot">
                           <i class="el-icon-picture-outline"></i>
                         </div>
                       </el-image>
                     </el-col>
                     <el-col :span="18">
-                      <div><el-tag type="danger" effect="plain" size="mini" style="margin-right: 4px"
-                          v-if="scope.row.promotionFullPieceId">满件打折</el-tag>{{ scope.row.goodsName }}</div>
+                      <div>{{ scope.row.esGoodsName }}</div>
                     </el-col>
                   </el-row>
                 </template>
               </el-table-column>
-              <el-table-column prop="price" label="单价" align="center"></el-table-column>
+              <el-table-column prop="goodsPrice" label="单价" align="center"></el-table-column>
               <el-table-column prop="num" label="数量" align="center"></el-table-column>
-              <el-table-column prop="payAmount" label="商品总金额" align="center" min-width="100"></el-table-column>
-              <el-table-column prop="refundAmount" label="退款金额" align="center"></el-table-column>
-              <el-table-column label="操作" align="center" width="160">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="primary">退款</el-button>
-                </template>
-              </el-table-column>
+              <el-table-column prop="totalAmount" label="商品总金额" align="center" min-width="100"></el-table-column>
+              <el-table-column prop="refundPrice" label="退款金额" align="center"></el-table-column>
             </el-table>
           </div>
 
-          <h3>收款信息</h3>
-          <div class="order-main">
+          <h3 v-if="detailsTypeCp==1">收款信息</h3>
+          <div v-if="detailsTypeCp==1" class="order-main">
             <div style="width: 100%; padding: 10px 15px 15px 15px">
               <el-row>
                 <el-col :span="10">
                   <div>
-                    <el-form ref="form" :model="form" label-width="80px" size="mini">
-                      <el-form-item label="收款金额">
-                        <el-input v-model="form.name"></el-input>
+                    <el-form ref="formSKref" :model="formSK" label-width="80px" size="mini">
+                      <el-form-item label="收款金额" prop="price" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        <el-input v-model="formSK.price"></el-input>
                       </el-form-item>
-                      <el-form-item label="备注">
-                        <el-input type="textarea" v-model="form.desc"></el-input>
+                      <el-form-item label="备注" prop="remark" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        <el-input type="textarea" v-model="formSK.remark"></el-input>
                       </el-form-item>
                     </el-form>
                   </div>
@@ -176,37 +166,102 @@
               </el-row>
             </div>
           </div>
-
         </div>
       </div>
     </zj-page-fill>
+    <div style="box-sizing: border-box; padding: 10px; text-align: right;">
+      <!-- 确定退货退款 -->
+      <el-button v-if="detailsTypeCp==2" type="primary" size="small" @click="faqituikuan">确定</el-button>
+      <!-- 确认收款 -->
+      <el-button v-if="detailsTypeCp==1" type="primary" size="small" @click="quererndingda">确认收款</el-button>
+    </div>
   </zj-page-container>
 </template>
 
 <script>
+import { esOrderDetail, esOrderRefund, esOrderPayPrice } from "@/api/orderManagement";
 export default {
-  name: "detail",
+  props:{
+    detailsId: {
+      type: [String, Number],
+      default: ""
+    },
+    detailsType: {
+      type: [String, Number],
+      default: ""
+    },
+  },
   data() {
     return {
-      form: {
+      detailsTypeCp: this.detailsType,
+      // 退货退款表单
+      formTH: {
 
       },
-      orderDetail: {
-        orderDetails: []
-      },
-      orderForm: {
+      // 收款表单
+      formSK: {
 
       },
-      orderFormRules: {
-
+      // 订单详情
+      orderDetail: {
+      },
+      // 物流详情
+      expressDetail: {
       },
     }
   },
-  created() {
-
+  computed:{
+    zhuangtai(){
+      return  !!~['SAVE','WAIT'].indexOf(this.orderDetail.status)?1:!!~['PAID'].indexOf(this.orderDetail.status)?2:!!~['SEND'].indexOf(this.orderDetail.status)?3:!!~['OVER'].indexOf(this.orderDetail.status)?4:-1
+    }
+  },
+  watch: {
+    detailsId: {
+      handler(newVal, oldVal) {
+        this.getEsOrderDetail()
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
-
+    getEsOrderDetail(){
+      esOrderDetail({
+        esOrderId: this.detailsId
+      }).then(res=>{
+        this.orderDetail = {
+          ...res.data
+        }
+      })
+    },
+    lookkuaidi(){
+      this.$emit("viewMaterialFlow", {...this.orderDetail})
+    },
+    faqituikuan(){
+      this.$refs.formTHref.validate((valid) => {
+        if (valid) {
+          esOrderRefund({
+            ...this.formTH
+          }).then(res=>{
+            this.$message({ type: 'success', message: `确定退货退款成功!` })
+            this.$emit("removeTab")
+          })
+        }
+      });
+    },
+    quererndingda(){
+      this.$refs.formSKref.validate((valid) => {
+        if (valid) {
+          esOrderPayPrice({
+            ...this.formSK
+          }).then(res=>{
+            this.$message({ type: 'success', message: `确认收款成功!` })
+            this.$emit("removeTab")
+          })
+        }
+      });
+      
+    }
   }
 }
 </script>

src/views/secondHandMall/orderManagement/getLbsAmapRegion.js

@@ -18,7 +18,7 @@ export default {
           formItemAttributes: {
             label: '客户地址', //省
             prop: 'provinceId',
-            rules: [],
+            rules:[{ required: true, message: '请选择', trigger: 'blur' }],
             errLabel: '省'
           },
           options: this.provinceList.map((v, i) => ({ value: v.id, label: v.name })),
@@ -42,7 +42,7 @@ export default {
             'label-width': '0px',
             label: '', //市
             prop: 'cityId',
-            rules: [],
+            rules:[{ required: true, message: '请选择', trigger: 'blur' }],
             errLabel: '市'
           },
           options: this.cityList.map((v, i) => ({ value: v.id, label: v.name })),
@@ -66,7 +66,7 @@ export default {
             'label-width': '0px',
             label: '', //区
             prop: 'areaId',
-            rules: [],
+            rules:[{ required: true, message: '请选择', trigger: 'blur' }],
             errLabel: '区'
           },
           options: this.areaList.map((v, i) => ({ value: v.id, label: v.name })),
@@ -90,7 +90,7 @@ export default {
             'label-width': '0px',
             label: '', //街道
             prop: 'streetId',
-            rules: [],
+            rules:[{ required: true, message: '请选择', trigger: 'blur' }],
             errLabel: '街道'
           },
           options: this.streetList.map((v, i) => ({ value: v.id, label: v.name })),
@@ -166,7 +166,7 @@ export default {
         {
           name: 'el-input',
           md: 24,
-          formItemAttributes: { label: '', prop: 'address', rules: [] },
+          formItemAttributes: { label: '', prop: 'address', rules:[{ required: true, message: '请选择', trigger: 'blur' }], },
           attributes: { disabled: false, placeholder: '详细地址' }
         },
       ]

src/views/secondHandMall/orderManagement/index.vue

@@ -30,17 +30,6 @@
                         </el-form-item>
                       </el-col>
                       <el-col :xs="24" :sm="12" :lg="6">
-                        <el-form-item label="状态" prop="evaluateStatus">
-                          <el-select v-model="screenForm.evaluateStatus" placeholder="全部">
-                            <el-option label="全部" value=""></el-option>
-                            <el-option label="未评价订单" :value="0"></el-option>
-                            <el-option label="已评价订单" :value="3"></el-option>
-                            <el-option label="差评订单" :value="1"></el-option>
-                            <el-option label="好评订单" :value="2"></el-option>
-                          </el-select>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :xs="24" :sm="12" :lg="6">
                         <el-form-item label="创建时间" prop="createDate" style="height: 33px;">
                           <el-date-picker v-model="screenForm.createDate" type="datetimerange"
                             value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期"
@@ -56,9 +45,11 @@
                         </el-form-item>
                       </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" class="tr">
-                        <el-form-item label="">
-                          <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
-                          <el-button size="small" @click="resetScreenForm">清空</el-button>
+                        <el-form-item label="" label-width="0px">
+                          <div style="text-align: left;">
+                            <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                            <el-button size="small" @click="resetScreenForm">清空</el-button>
+                          </div>
                         </el-form-item>
                       </el-col>
                     </el-row>
@@ -68,23 +59,22 @@
                   <div class="fl">
                     <el-tabs v-model="tabCurrent" type="card" @tab-click="changeTabs" class="fl" size="small" style="margin-right: 10px">
                       <el-tab-pane label="全部" name="ALL"></el-tab-pane>
-                      <el-tab-pane label="待付款" name="NOPAY"></el-tab-pane>
-                      <el-tab-pane label="待确认" name="DQR"></el-tab-pane>
-                      <el-tab-pane label="待发货" name="DFH"></el-tab-pane>
-                      <el-tab-pane label="已发货" name="YFH"></el-tab-pane>
+                      <el-tab-pane label="待付款" name="SAVE"></el-tab-pane>
+                      <el-tab-pane label="待确认" name="WAIT"></el-tab-pane>
+                      <el-tab-pane label="待发货" name="PAID"></el-tab-pane>
+                      <el-tab-pane label="已发货" name="SEND"></el-tab-pane>
                       <el-tab-pane label="已完成" name="OVER"></el-tab-pane>
-                      <el-tab-pane label="退款/取消" name="CLOSE"></el-tab-pane>
-                      <el-tab-pane label="已超时" name="TIMEOUT"></el-tab-pane>
+                      <el-tab-pane label="已退货/取消" name="CANCEL"></el-tab-pane>
+                      <el-tab-pane label="已超时" name="TIME_OUT"></el-tab-pane>
                     </el-tabs>
                     <el-button class="fl" type="primary" size="small" @click="add">新增</el-button>
                   </div>
                   <div class="fr">
-                    <el-button size="small" type="primary">导出</el-button>
+                    <el-button size="small" type="primary" @click="handleExport">导出</el-button>
                   </div>
                 </div>
                 <zj-page-fill>
                   <div class="order-main-container">
-                    <!--  -->
                     <div class="table-top">
                       <el-row style="width:100%">
                         <el-col :span="3">
@@ -98,87 +88,70 @@
                         <el-col :span="3" style="text-align: center"><span class="item">操作</span></el-col>
                       </el-row>
                     </div>
-                    <!--  -->
                     <div class="order-item" v-for="order in dataList" :key="order.orderId">
                       <div class="order-top">
-                        <span><b>订单号</b>：{{ order.orderId }}</span>
+                        <span><b>订单号</b>：{{ order.esOrderId }}</span>
                         <span><b>下单时间</b>：{{ order.createTime }}</span>
-                        <el-tag>商城销售</el-tag>
+                        <!-- <el-tag>商城销售</el-tag> -->
                         <div class="fr"></div>
                       </div>
                       <div class="order-content">
                         <el-row style="width:100%;">
                           <el-col :span="6" style="height: 100%;">
                             <div class="col-item-pro">
-                              <div class="pro-item" v-for="orderItem in order.orderDetails" :key="orderItem.orderDetailId">
+                              <div class="pro-item">
                                 <div class="left">
                                   <div class="image">
-                                    <img :src="orderItem.imgUrl" style="height:80px;width: 80px;">
+                                    <img :src="order.goodsUrl" style="height:80px;width: 80px;">
                                   </div>
                                   <div class="main">
-                                    <span><el-tag type="danger" effect="plain" size="mini" style="margin-right: 4px"
-                                        v-if="orderItem.promotionFullPieceId">满件打折</el-tag>{{ orderItem.esGoodsName }}</span>
-                                    <span class="spec"
-                                      v-if="orderItem.goodsSpecName === '默认' && orderItem.goodsSpecValue === '默认'">默认</span>
-                                    <span class="spec" v-else>{{ orderItem.goodsSpecName }}-{{ orderItem.goodsSpecValue
-                                      }}</span>
+                                    <span>{{ order.esGoodsName }}</span>
                                   </div>
                                 </div>
                                 <div class="right">
-                                  <span>￥{{ orderItem.price }}</span>
-                                  <span>x{{ orderItem.num }}</span>
+                                  <span>￥{{ order.goodsPrice }}</span>
+                                  <span>x{{ order.num }}</span>
                                 </div>
                               </div>
                             </div>
                           </el-col>
                           <el-col :span="4" style="height: 100%;">
                             <div class="col-item">
-                              <div>{{ order.userName }}</div>
-                              <div>{{ order.userMobile }}</div>
+                              <div>{{ order.wechatUserName }}</div>
+                              <div>{{ order.wechatUserMobile }}</div>
                             </div>
                           </el-col>
                           <el-col :span="4" style="height: 100%;">
                             <div class="col-item">
-                              <div>{{ order.receUserName }}/{{ order.recePhone }}</div>
-                              <div class="ellipsis-2">{{ order.province + order.city + order.area + order.street + order.receAddress + order.houseNo }}</div>
+                              <div>{{ order.userName }}/{{ order.userMobile }}</div>
+                              <div class="ellipsis-2">{{ order.province + order.city + order.area + order.street + order.receAddress }}</div>
                             </div>
                           </el-col>
                           <el-col :span="4" style="height: 100%;">
                             <div class="col-item">
-                              <div class="totalprice">￥{{ order.payAmount }}</div>
-                              <div style="font-size: 12px" v-if="order.discountAmount">(<span>-{{ order.discountAmount
-                                  }}</span><span v-if="order.promotionDiscountRate">/{{ order.promotionDiscountRate * 10
-                                  }}折</span>)</div>
+                              <div class="totalprice">￥{{ order.totalAmount }}</div>
                             </div>
                           </el-col>
                           <el-col :span="3" style="height: 100%;">
                             <div class="col-item">
                               <div style="display: flex; align-items: center;">
-                                <img src="@/assets/order/CLOSE.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'CLOSE'">
-                                <img src="@/assets/order/DFH.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'DFH'">
-                                <img src="@/assets/order/NOPAY.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'NOPAY'">
-                                <img src="@/assets/order/OVER.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'OVER'">
-                                <img src="@/assets/order/TIMEOUT.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'TIMEOUT'">
-                                <img src="@/assets/order/YFH.png" style="width: 16px; flex-shrink: 0;"
-                                  v-if="order.status == 'YFH'">
-                                <span style="margin-left: 4px">{{ order.status | ORDER_CURRENT_STATUS_FILTER }}</span>
+                                <span style="margin-left: 4px">{{ ({SAVE: "买家下单", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "取消", WAIT_REFUND: "售后中", REFUND: "已退"})[order.status] }}</span>
                               </div>
-                              <div>({{ order.toWorkOrder ? '已派单' : '未派单' }})</div>
                             </div>
                           </el-col>
                           <el-col :span="3" style="height: 100%;">
-                            <div class="col-item">
+                            <div class="col-item">  
                               <div class="operate">
-                                <el-popconfirm title="确定确认订单吗？" @confirm="">
+                                <el-popconfirm title="确认订单吗？" @confirm="quedingesOrderPayOk">
                                   <el-button slot="reference" type="text" size="small">确认订单</el-button>
                                 </el-popconfirm>
-                                <el-button @click="viewDetails" type="text" size="small">查看详情</el-button>
-                                <el-button @click="viewMaterialFlow" type="text" size="small">查看物流</el-button>
+                                <el-popconfirm title="确认取消订单吗？" @confirm="quedingesOrderCancel">
+                                  <el-button slot="reference" type="text" size="small">取消订单</el-button>
+                                </el-popconfirm>
+                                <el-button @click="viewMaterialFlow(order)" type="text" size="small">查看物流</el-button>
+                                <el-button @click="viewDetails(order, 0)" type="text" size="small">查看详情</el-button>
+                                <el-button @click="viewDetails(order, 1)" type="text" size="small">确认收款</el-button>
+                                <el-button @click="viewDetails(order, 2)" type="text" size="small">退货</el-button>
                               </div>
                             </div>
                           </el-col>
@@ -201,31 +174,35 @@
           </div>
           <!-- 新增 -->
           <div v-if="activeKey == 'add'" style="width:100%;height:100%;">
-            <add/>
+            <add :detailsId="detailsId" @removeTab="()=>{
+              getList()
+              data.removeTab()
+            }"/>
           </div>
           <!-- 查看详情 -->
           <div v-if="activeKey == 'details'" style="width:100%;height:100%;">
-            <detailsV/>
-          </div>
-          <!-- 确认订单 -->
-          <div v-if="activeKey == 'remark'" style="width:100%;height:100%;">
-            
+            <detailsV :detailsId="detailsId" :detailsType="detailsType" @viewMaterialFlow="viewMaterialFlow" @removeTab="()=>{
+              getList()
+              data.removeTab()
+            }"/>
           </div>
           <!-- 确认收款 -->
           <div v-if="activeKey == 'materialDetail'" style="width:100%;height:100%;">
-            
+            <detailsV :detailsId="detailsId" :detailsType="detailsType" @viewMaterialFlow="viewMaterialFlow" @removeTab="()=>{
+              getList()
+              data.removeTab()
+            }"/>
           </div>
-          <!-- 取消订单 -->
-          <div v-if="activeKey == 'deliverGoods'" style="width:100%;height:100%;">
-            
+          <!-- 退货 -->
+          <div v-if="activeKey == 'editAddress3'" style="width:100%;height:100%;">
+            <detailsV :detailsId="detailsId" :detailsType="detailsType" @viewMaterialFlow="viewMaterialFlow" @removeTab="()=>{
+              getList()
+              data.removeTab()
+            }"/>
           </div>
           <!-- 查看物流 -->
           <div v-if="activeKey == 'materialFlow'" style="width:100%;height:100%;">
-            <materialFlow/>
-          </div>
-          <!-- 退货 -->
-          <div v-if="activeKey == 'editAddress3'" style="width:100%;height:100%;">
-            
+            <materialFlow :detailsId="detailsId"/>
           </div>
         </template>
       </zj-tab-page>
@@ -235,14 +212,14 @@
 </template>
 
 <script>
-import { esOrderList } from "@/api/orderManagement";
+import { esOrderList, esOrderListExcel, esOrderPayOk, esOrderCancel } from "@/api/orderManagement";
 import add from "./add.vue"
 import detailsV from "./details.vue"
 import materialFlow from "./materialFlow.vue"
 import '@/styles/order-list.scss'
+import { downloadFiles } from '@/utils/util'
 export default {
   components: {add, detailsV, materialFlow},
-
   data() {
     return {
       screenForm: { // 筛选表单数据
@@ -271,15 +248,30 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [],
+      detailsId: "",
+      detailsType: "",
     }
   },
-  computed: {
-
-  },
   created() {
     this.getList();
   },
   methods: {
+    quedingesOrderPayOk(row){
+      esOrderPayOk({
+        esOrderId:row.esOrderId
+      }).then(res=>{
+        this.$message({ type: 'success', message: `确定成功!` })
+        this.getList();
+      })
+    },
+    quedingesOrderCancel(row){
+      esOrderCancel({
+        esOrderId:row.esOrderId
+      }).then(res=>{
+        this.$message({ type: 'success', message: `取消成功!` })
+        this.getList();
+      })
+    },
     add(){
       this.$refs.tabPage.addTab({
         // 对应显示的模块
@@ -298,7 +290,7 @@ export default {
         }
       })
     },
-    viewDetails(){
+    viewDetails(row, type){
       this.$refs.tabPage.addTab({
         // 对应显示的模块
         activeKey: "details",
@@ -308,7 +300,8 @@ export default {
         label: "订单详情",
         // 打开时事件
         triggerEvent: () => {
-        
+          this.detailsId = row.esOrderId
+          this.detailsType = type
         },
         // 关闭时事件
         closeEvent: () => {
@@ -316,7 +309,7 @@ export default {
         }
       })
     },
-    viewMaterialFlow(){
+    viewMaterialFlow(row){
       this.$refs.tabPage.addTab({
         // 对应显示的模块
         activeKey: "materialFlow",
@@ -326,7 +319,7 @@ export default {
         label: "查看物流",
         // 打开时事件
         triggerEvent: () => {
-        
+          this.detailsId = row.esOrderId
         },
         // 关闭时事件
         closeEvent: () => {
@@ -362,16 +355,12 @@ export default {
         this.listTotal = res.data.total;
       })
     },
-    openForm(type, order) {
-
-    },
     // 更改每页数量
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
       this.getList();
     },
-
     // 更改当前页
     handleCurrentChange(val) {
       this.currentPage = val;
@@ -388,6 +377,23 @@ export default {
       this.currentPage = 1;
       this.getList();
     },
+    // 导出
+    handleExport() {
+      let params = {
+        orderId: this.screenForm.orderId, // 订单号
+        esGoodsName: this.screenForm.esGoodsName, // 商品名称
+        userName: this.screenForm.userName, // 会员昵称
+        userMobile: this.screenForm.userMobile, // 手机号
+        status: this.screenForm.status, // 状态
+        startCreateTime: this.screenForm.createDate[0] ? this.screenForm.createDate[0] : null, // 创建时间
+        endCreateTime: this.screenForm.createDate[1] ? this.screenForm.createDate[1] : null, // 创建时间
+        startPayTime: this.screenForm.payDate[0] ? this.screenForm.payDate[0] : null, // 支付时间
+        endPayTime: this.screenForm.payDate[1] ? this.screenForm.payDate[1] : null, // 支付时间
+        pageNum: this.currentPage,
+        pageSize: this.pageSize
+      };
+      downloadFiles('esOrder/listExcel', params);
+    },
   }
 }
 

src/views/secondHandMall/orderManagement/materialFlow.vue

@@ -3,11 +3,12 @@
     <zj-page-fill>
       <div style="box-sizing: border-box; padding:10px;">
         <div>
+          
           <div class="order-main">
             <el-row style="padding: 15px 15px 10px">
               <el-col :span="24">
                 <div class="order-main-title">
-                  <span>订单编号：{{ orderDetail.orderId }}</span>
+                  <span>订单编号：{{ orderDetail.esOrderId }}</span>
                   <span>下单时间：{{ orderDetail.createTime }}</span>
                 </div>
               </el-col>
@@ -19,12 +20,12 @@
                     <div class='info_title'>卖家信息</div>
                     <div class='info_bottom'>
                       <div class='info_bottom_lt'>
-                        <el-image style='width: 40px; height: 40px' src=""></el-image>
+                        <el-image style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
                       </div>
                       <div class='info_bottom_rt'>
-                        <div>微信昵称：{formData.userName}</div>
-                        <div>微信手机号：{formData.phone}</div>
-                        <div>发布时间：{formData.goodsCreateTime}</div>
+                        <div>昵称：{{orderDetail.sellName}}</div>
+                        <div>手机号：{{orderDetail.sellMobile}}</div>
+                        <div>发布时间：{{orderDetail.sellTime}}</div>
                       </div>
                     </div>
                   </div>
@@ -34,15 +35,15 @@
                     <div class='info_title'>买家信息</div>
                     <div class='info_bottom'>
                       <div class='info_bottom_lt'>
-                        <el-image style='width: 40px; height: 40px' src="">
+                        <el-image style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
                         </el-image>
                       </div>
                       <div class='info_bottom_rt'>
-                        <div>微信昵称：{formData.buyerUserName}</div>
-                        <div>微信手机号：{formData.buyerUserPhone}</div>
-                        <div>收货人信息：{formData.consigneeName}</div>
-                        <div>收货人地址：{formData.address}</div>
-                        <div>支付方式：{formData.payType === 'WECHAT'}</div>
+                        <div v-if="orderDetail.wechatUserName">昵称：{{orderDetail.wechatUserName}}</div>
+                        <div v-if="orderDetail.wechatUserMobile">手机号：{{orderDetail.wechatUserMobile}}</div>
+                        <div>收货人信息：({{orderDetail.userName}}){{orderDetail.userMobile}}</div>
+                        <div>收货人地址：{{ orderDetail.province + orderDetail.city + orderDetail.area + orderDetail.street + orderDetail.receAddress }}</div>
+                        <div>支付方式：{{({WECHAT:"微信支付", CASH:"现金支付", TRANSFER:"转账支付"})[orderDetail.payType]}}</div>
                       </div>
                     </div>
                   </div>
@@ -53,13 +54,15 @@
                     <div class='info_bottom'>
                       <div class='info_bottom_rt'>
                         <div>
-                          <el-radio-group value={formData.logisticsType}>
-                            <el-radio label='SELF'>自提</el-radio>
-                            <el-radio label='DELIVERY'>物流</el-radio>
+                          <el-radio-group disabled v-model="orderDetail.pickType">
+                            <el-radio label='YES'>自提</el-radio>
+                            <el-radio label='NO'>物流</el-radio>
                           </el-radio-group>
                         </div>
-                        <div>快递单号：{formData.logisticsNum}</div>
-                        <div>快递公司：{formData.logisticsName}</div>
+                        <div>快递单号：{{orderDetail.logisticsNo}}</div>
+                        <div>快递公司：{{orderDetail.logisticsName}}</div>
+                        <el-button v-if="detailsTypeCp==0 && orderDetail.logisticsCode && orderDetail.logisticsNo" type='primary' size='small' @click="lookkuaidi">查看物流
+                        </el-button>
                       </div>
                     </div>
                   </div>
@@ -67,36 +70,19 @@
               </el-row>
             </div>
           </div>
-          
+
           <h3>物流信息</h3>
           <div class="order-detail">
-            <el-table :data="orderDetail.orderDetails" style="width: 100%" border>
-              <el-table-column label="商品信息" min-width="200">
+            <el-table :data="expressList" style="width: 100%" border>
+              <el-table-column prop="comName" label="物流公司" align="center"></el-table-column>
+              <el-table-column prop="areaName" label="地区名称" align="center"></el-table-column>
+              <el-table-column prop="time" label="物流时间" align="center" min-width="100"></el-table-column>
+              <el-table-column prop="state" label="物流状态" align="center">
                 <template slot-scope="scope">
-                  <el-row>
-                    <el-col :span="6">
-                      <el-image style="width: 40px; height: 40px" :src="scope.row.imgUrl">
-                        <div slot="error" class="image-slot">
-                          <i class="el-icon-picture-outline"></i>
-                        </div>
-                      </el-image>
-                    </el-col>
-                    <el-col :span="18">
-                      <div><el-tag type="danger" effect="plain" size="mini" style="margin-right: 4px"
-                          v-if="scope.row.promotionFullPieceId">满件打折</el-tag>{{ scope.row.goodsName }}</div>
-                    </el-col>
-                  </el-row>
-                </template>
-              </el-table-column>
-              <el-table-column prop="price" label="单价" align="center"></el-table-column>
-              <el-table-column prop="num" label="数量" align="center"></el-table-column>
-              <el-table-column prop="payAmount" label="商品总金额" align="center" min-width="100"></el-table-column>
-              <el-table-column prop="refundAmount" label="退款金额" align="center"></el-table-column>
-              <el-table-column label="操作" align="center" width="160">
-                <template slot-scope="scope">
-                  <el-button size="mini" type="primary">退款</el-button>
+                  <div>{{ ({0:'在途',1:'揽收',2:'疑难',3:'签收',4:'退签',5:'派件',6:'退回'})[scope.row.state] }}</div>
                 </template>
               </el-table-column>
+              <el-table-column prop="context" label="物流详情" align="center"></el-table-column>
             </el-table>
           </div>
 
@@ -107,29 +93,50 @@
 </template>
 
 <script>
+import { esOrderDetail, esOrderExpress, esOrderRefund, esOrderPayPrice } from "@/api/orderManagement";
 export default {
-  name: "detail",
+  props:{
+    detailsId: {
+      type: [String, Number],
+      default: ""
+    },
+  },
   data() {
     return {
-      form: {
-
-      },
+      // 订单详情
       orderDetail: {
-        orderDetails: []
-      },
-      orderForm: {
-
-      },
-      orderFormRules: {
-
       },
+      // 物流详情
+      expressList: [],
     }
   },
-  created() {
-
+  watch: {
+    detailsId: {
+      handler(newVal, oldVal) {
+        this.getEsOrderDetail()
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
-
+    getEsOrderDetail(){
+      esOrderDetail({
+        esOrderId: this.detailsId
+      }).then(res=>{
+        this.orderDetail = {
+          ...res.data
+        }
+        if(this.orderDetail.logisticsCode && this.orderDetail.logisticsNo){
+          esOrderExpress({
+            companyCode:this.orderDetail.logisticsCode,
+            logisticsNo:this.orderDetail.logisticsNo
+          }).then(res2=>{
+            this.expressList = res2.data
+          })
+        }
+      })
+    },
   }
 }
 </script>