no message

src/api/orderManagement.js

@@ -51,7 +51,7 @@ export function esOrderSend(params) {
 export function esOrderExpress(params) {
   return request({
     url: '/esOrder/express',
-    method: 'post',
+    method: 'get',
     params
   })
 }
@@ -104,3 +104,11 @@ export function esOrderRefundPrice(params) {
   })
 }
 
+export function esOrderPayPriceList(params) {
+  return request({
+    url: '/esOrder/payPriceList',
+    method: 'post',
+    params
+  })
+}
+

src/views/secondHandMall/activistOrder/details.vue

@@ -7,7 +7,7 @@
             <el-row style="padding: 15px 15px 10px">
               <el-col :span="24">
                 <div class="order-main-title">
-                  <span>订单编号：{{ orderDetail.esOrderRefundId }}</span>
+                  <span>售后编号：{{ orderDetail.esOrderRefundId }}</span>
                   <span>下单时间：{{ orderDetail.createTime }}</span>
                 </div>
               </el-col>

src/views/secondHandMall/activistOrder/index.vue

@@ -15,6 +15,11 @@
                         </el-form-item>
                       </el-col>
                       <el-col :xs="24" :sm="12" :lg="6">
+                        <el-form-item label="售后编号" prop="esOrderRefundId">
+                          <el-input v-model="screenForm.esOrderRefundId" placeholder="请输入售后编号"></el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :xs="24" :sm="12" :lg="6">
                         <el-form-item label="商品名称" prop="esGoodsName">
                           <el-input v-model="screenForm.esGoodsName" placeholder="请输入商品名称"></el-input>
                         </el-form-item>
@@ -85,7 +90,7 @@
                     </div>
                     <div class="order-item" v-for="order in dataList" :key="order.orderId">
                       <div class="order-top">
-                        <span><b>订单号</b>：{{ order.esOrderRefundId }}</span>
+                        <span><b>售后编号</b>：{{ order.esOrderRefundId }}</span>
                         <span><b>下单时间</b>：{{ order.createTime }}</span>
                         <!-- <el-tag>商城销售</el-tag> -->
                         <div class="fr"></div>
@@ -188,6 +193,7 @@ export default {
     return {
       screenForm: { // 筛选表单数据
         orderId: '', // 订单号
+        esOrderRefundId: "",
         esGoodsName: '', // 商品名称
         userName: '', // 会员昵称
         userMobile: '', // 手机号
@@ -239,6 +245,7 @@ export default {
     getList() {
       let params = {
         orderId: this.screenForm.orderId, // 订单号
+        esOrderRefundId: this.screenForm.esOrderRefundId, // 订单号
         esGoodsName: this.screenForm.esGoodsName, // 商品名称
         userName: this.screenForm.userName, // 会员昵称
         userMobile: this.screenForm.userMobile, // 手机号
@@ -284,6 +291,7 @@ export default {
     handleExport() {
       let params = {
         orderId: this.screenForm.orderId, // 订单号
+        esOrderRefundId: this.screenForm.esOrderRefundId, // 订单号
         esGoodsName: this.screenForm.esGoodsName, // 商品名称
         userName: this.screenForm.userName, // 会员昵称
         userMobile: this.screenForm.userMobile, // 手机号

src/views/secondHandMall/orderManagement/details.vue

@@ -1,176 +1,206 @@
 <template>
   <zj-page-container>
+    <div style="box-sizing: border-box; padding:0 10px;">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="详情" name="first"></el-tab-pane>
+        <el-tab-pane label="操作记录" name="second"></el-tab-pane>
+      </el-tabs>
+    </div>
     <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.esOrderId }}</span>
-                  <span>下单时间：{{ orderDetail.createTime }}</span>
-                </div>
-              </el-col>
-            </el-row>
-            <div style="width: 100%; padding: 10px 15px 15px 15px">
-              <el-row>
-                <el-col :span="10">
-                  <!--  -->
-                  <div v-if="~[0, 1].indexOf(detailsTypeCp)" style="display: flex;">
-                    <div>
-                      <div class="order-main-status">
-                        <span>{{ ({SAVE: "买家下单", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "已退货/取消", WAIT_REFUND: "售后中"})[orderDetail.status] }}</span>
-                      </div>
-                      <div class="order-main-opt-btn">
-                        <template>
-                          <el-button v-if="~['SEND','OVER'].indexOf(orderDetail.status)" size="small" type="primary" @click="lookkuaidi">查看物流</el-button>
-                          <el-button v-if="~['SEND','OVER'].indexOf(orderDetail.status)" size="small" type="primary" @click="detailsTypeCp = 2">退货退款</el-button>
-                        </template>
-                      </div>
-                    </div>
+      <template v-if="activeName=='first'">
+        <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.esOrderId }}</span>
+                    <span>下单时间：{{ orderDetail.createTime }}</span>
                   </div>
-                  <!--  -->
-                  <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 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 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="formTH.refundRemark"></el-input>
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </el-col>
-                <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>
-            </div>
-          </div>
-
-          <div class="order-receive-info">
-            <el-row :gutter="10">
-              <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-                <div class='info'>
-                  <div class='info_title'>卖家信息</div>
-                  <div class='info_bottom'>
-                    <div class='info_bottom_lt'>
-                      <el-image v-if="orderDetail.sellUrl" style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
-                    </div>
-                    <div class='info_bottom_rt'>
-                      <div>昵称：{{orderDetail.sellName}}</div>
-                      <div>手机号：{{orderDetail.sellMobile}}</div>
-                      <div>发布时间：{{orderDetail.sellTime}}</div>
+              <div style="width: 100%; padding: 10px 15px 15px 15px">
+                <el-row>
+                  <el-col :span="10">
+                    <!--  -->
+                    <div v-if="~[0, 1].indexOf(detailsTypeCp)" style="display: flex;">
+                      <div>
+                        <div class="order-main-status">
+                          <span>{{ ({SAVE: "买家下单", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "已完成", TIME_OUT: "超时", CANCEL: "已退货/取消", WAIT_REFUND: "售后中"})[orderDetail.status] }}</span>
+                        </div>
+                        <div class="order-main-opt-btn">
+                          <template>
+                            <el-button v-if="~['SEND','OVER'].indexOf(orderDetail.status)" size="small" type="primary" @click="lookkuaidi">查看物流</el-button>
+                            <el-button v-if="~['SEND','OVER'].indexOf(orderDetail.status)" size="small" type="primary" @click="detailsTypeCp = 2">退货退款</el-button>
+                          </template>
+                        </div>
+                      </div>
                     </div>
-                  </div>
-                </div>
-              </el-col>
-              <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-                <div class='info'>
-                  <div class='info_title'>买家信息</div>
-                  <div class='info_bottom'>
-                    <div class='info_bottom_lt'>
-                      <el-image v-if="orderDetail.wechatUserUrl" style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
-                      </el-image>
+                    <!--  -->
+                    <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 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 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="formTH.refundRemark"></el-input>
+                        </el-form-item>
+                      </el-form>
                     </div>
-                    <div class='info_bottom_rt'>
-                      <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>
+                  </el-col>
+                  <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>
+              </div>
+            </div>
+  
+            <div class="order-receive-info">
+              <el-row :gutter="10">
+                <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+                  <div class='info'>
+                    <div class='info_title'>卖家信息</div>
+                    <div class='info_bottom'>
+                      <div class='info_bottom_lt'>
+                        <el-image v-if="orderDetail.sellUrl" style='width: 40px; height: 40px' :src="orderDetail.sellUrl"></el-image>
+                      </div>
+                      <div class='info_bottom_rt'>
+                        <div>昵称：{{orderDetail.sellName}}</div>
+                        <div>手机号：{{orderDetail.sellMobile}}</div>
+                        <div>发布时间：{{orderDetail.sellTime}}</div>
+                      </div>
                     </div>
                   </div>
-                </div>
-              </el-col>
-              <el-col v-if="~['SEND','OVER'].indexOf(orderDetail.status)" :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-                <div class='info'>
-                  <div class='info_title'>物流信息</div>
-                  <div class='info_bottom'>
-                    <div class='info_bottom_rt'>
-                      <div>
-                        <el-radio-group disabled v-model="orderDetail.pickType">
-                          <el-radio label='YES'>自提</el-radio>
-                          <el-radio label='NO'>物流</el-radio>
-                        </el-radio-group>
+                </el-col>
+                <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+                  <div class='info'>
+                    <div class='info_title'>买家信息</div>
+                    <div class='info_bottom'>
+                      <div class='info_bottom_lt'>
+                        <el-image v-if="orderDetail.wechatUserUrl" style='width: 40px; height: 40px' :src="orderDetail.wechatUserUrl">
+                        </el-image>
+                      </div>
+                      <div class='info_bottom_rt'>
+                        <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>快递单号：{{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>
-              </el-col>
-            </el-row>
-          </div>
-
-          <h3>商品信息</h3>
-          <div class="order-main" style="border:none;">
-            <!-- 订单表格 -->
-            <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.goodsUrl">
-                        <div slot="error" class="image-slot">
-                          <i class="el-icon-picture-outline"></i>
+                </el-col>
+                <el-col v-if="~['SEND','OVER'].indexOf(orderDetail.status)" :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+                  <div class='info'>
+                    <div class='info_title'>物流信息</div>
+                    <div class='info_bottom'>
+                      <div class='info_bottom_rt'>
+                        <div>
+                          <el-radio-group disabled v-model="orderDetail.pickType">
+                            <el-radio label='YES'>自提</el-radio>
+                            <el-radio label='NO'>物流</el-radio>
+                          </el-radio-group>
                         </div>
-                      </el-image>
-                    </el-col>
-                    <el-col :span="18">
-                      <div>{{ scope.row.esGoodsName }}</div>
-                    </el-col>
-                  </el-row>
-                </template>
-              </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="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 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="formSKref" :model="formSK" label-width="80px" size="mini">
-                      <el-form-item label="收款金额" prop="price" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
-                        <el-input type="number" v-model="formSK.price"></el-input>
-                      </el-form-item>
-                      <el-form-item label="收款金额" prop="fileUrl">
-                        <ImageUpload :fileList="formSK.fileUrl" :limit="1"/>
-                      </el-form-item>
-                      <el-form-item label="备注" prop="remark">
-                        <el-input type="textarea" v-model="formSK.remark"></el-input>
-                      </el-form-item>
-                    </el-form>
+                        <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>
                 </el-col>
               </el-row>
             </div>
+  
+            <h3>商品信息</h3>
+            <div class="order-main" style="border:none;">
+              <!-- 订单表格 -->
+              <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.goodsUrl">
+                          <div slot="error" class="image-slot">
+                            <i class="el-icon-picture-outline"></i>
+                          </div>
+                        </el-image>
+                      </el-col>
+                      <el-col :span="18">
+                        <div>{{ scope.row.esGoodsName }}</div>
+                      </el-col>
+                    </el-row>
+                  </template>
+                </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="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 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="formSKref" :model="formSK" label-width="80px" size="mini">
+                        <el-form-item label="收款金额" prop="price" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                          <el-input type="number" v-model="formSK.price"></el-input>
+                        </el-form-item>
+                        <el-form-item label="收款金额" prop="fileUrl">
+                          <ImageUpload :fileList="formSK.fileUrl" :limit="1"/>
+                        </el-form-item>
+                        <el-form-item label="备注" prop="remark">
+                          <el-input type="textarea" v-model="formSK.remark"></el-input>
+                        </el-form-item>
+                      </el-form>
+                    </div>
+                  </el-col>
+                </el-row>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+      <template v-if="activeName=='second'">
+        <div style="box-sizing: border-box; padding:10px;">
+          <div>
+            <div class="order-main" style="border:none;">
+              <el-table :data="orderPayPriceList" style="width: 100%" border>
+                <el-table-column prop="price" label="收款金额" align="center"></el-table-column>
+                <el-table-column prop="fileUrl" label="收款凭证" min-width="200">
+                  <template slot-scope="scope">
+                    <el-image style="width: 40px; height: 40px" :src="scope.row.fileUrl">
+                      <div slot="error" class="image-slot">
+                        <i class="el-icon-picture-outline"></i>
+                      </div>
+                    </el-image>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="createBy" label="操作人" align="center" min-width="100"></el-table-column>
+                <el-table-column prop="createTime" label="操作时间" align="center"></el-table-column>
+              </el-table>
+            </div>
           </div>
         </div>
-      </div>
+      </template>
     </zj-page-fill>
     <div style="box-sizing: border-box; padding: 10px; text-align: right;">
       <!-- 确定退货退款 -->
@@ -182,7 +212,7 @@
 </template>
 
 <script>
-import { esOrderDetail, esOrderRefund, esOrderPayPrice } from "@/api/orderManagement";
+import { esOrderDetail, esOrderRefund, esOrderPayPrice, esOrderPayPriceList } from "@/api/orderManagement";
 import ImageUpload from '@/components/file-upload'
 export default {
   components:{
@@ -200,6 +230,7 @@ export default {
   },
   data() {
     return {
+      activeName: "first",
       detailsTypeCp: this.detailsType,
       // 退货退款表单
       formTH: {
@@ -215,6 +246,7 @@ export default {
       // 物流详情
       expressDetail: {
       },
+      orderPayPriceList:[],
     }
   },
   computed:{
@@ -240,6 +272,12 @@ export default {
           ...res.data
         }
       })
+      esOrderPayPriceList({
+        esOrderId: this.detailsId
+      }).then(res=>{
+        this.orderPayPriceList = res.data
+        console.log(this.orderPayPriceList)
+      })
     },
     lookkuaidi(){
       this.$emit("viewMaterialFlow", {...this.orderDetail})

src/views/secondHandMall/orderManagement/index.vue

@@ -139,7 +139,7 @@
                           <el-col :span="3" style="height: 100%;">
                             <div class="col-item">
                               <div style="display: flex; align-items: center;">
-                                <span style="margin-left: 4px">{{ ({SAVE: "待支付", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "交易完成", TIME_OUT: "超时", CANCEL: "取消", WAIT_REFUND: "售后中", REFUND: "已退"})[order.status] }}</span>
+                                <span style="margin-left: 4px">{{ ({SAVE: "待支付", WAIT: "待确认", PAID: "待发货", SEND: "卖家发货", OVER: "已完成", TIME_OUT: "超时", CANCEL: "取消", WAIT_REFUND: "售后中", REFUND: "已退"})[order.status] }}</span>
                               </div>
                             </div>
                           </el-col>