no message

src/api/orderManagement.js

@@ -1,5 +1,13 @@
 import request, { postBlob, getBlob, handleImport } from '@/utils/request'
 
+export function esOrderListRefund(params) {
+  return request({
+    url: '/esOrder/listRefund',
+    method: 'post',
+    params
+  })
+}
+
 export function esOrderList(params) {
   return request({
     url: '/esOrder/list',
@@ -8,6 +16,14 @@ export function esOrderList(params) {
   })
 }
 
+export function esOrderDetailRefund(params) {
+  return request({
+    url: '/esOrder/detailRefund',
+    method: 'post',
+    params
+  })
+}
+
 export function esOrderDetail(params) {
   return request({
     url: '/esOrder/detail',
@@ -72,3 +88,11 @@ export function esOrderCancel(params) {
   })
 }
 
+export function esOrderRefundPrice(params) {
+  return request({
+    url: '/esOrder/refundPrice',
+    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.orderId }}</span>
+                  <span>订单编号：{{ orderDetail.esOrderRefundId }}</span>
                   <span>下单时间：{{ orderDetail.createTime }}</span>
                 </div>
               </el-col>
@@ -15,34 +15,40 @@
             <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-radio-group v-model="form.resource">
-                          <el-radio label="仅退货"></el-radio>
-                          <el-radio label="仅退款"></el-radio>
-                          <el-radio label="退货退款"></el-radio>
+                  <div v-if="~['WAIT'].indexOf(orderDetail.status)">
+                    <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 label="FAIL">驳回</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>
+                  <div v-else style="display: flex;">
+                    <div>
+                      <div class="order-main-status">
+                        <span>{{ ({WAIT: "平台处理", OVER: "完成"})[orderDetail.status] }}</span>
+                      </div>
+                    </div>
+                  </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-steps :active="zhuangtai" align-center>
+                    <el-step title="买家申请" ></el-step>
+                    <el-step title="平台处理" ></el-step>
+                    <el-step title="维权完成" ></el-step>
                   </el-steps>
                 </el-col>
               </el-row>
@@ -56,12 +62,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>
@@ -71,15 +77,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>
@@ -89,16 +95,7 @@
                   <div class='info_title'>物流信息</div>
                   <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>
-                      </div>
-                      <div>快递单号：{formData.logisticsNum}</div>
-                      <div>快递公司：{formData.logisticsName}</div>
-                      <el-button type='primary' size='small'>查看物流
-                      </el-button>
+                      
                     </div>
                   </div>
                 </div>
@@ -107,66 +104,103 @@
           </div>
 
           <h3>商品信息</h3>
-          <div class="order-detail">
-            <el-table :data="orderDetail.orderDetails" style="width: 100%" border>
+          <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.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>
+
         </div>
       </div>
     </zj-page-fill>
+    <div v-if="~['WAIT'].indexOf(orderDetail.status)" style="box-sizing: border-box; padding: 10px; text-align: right;">
+      <el-button size="small" @click="faqituikuan">确定</el-button>
+    </div>
   </zj-page-container>
 </template>
 
 <script>
+import { esOrderDetailRefund, esOrderRefundPrice } 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: {
-
-      },
-      orderFormRules: {
-
       },
     }
   },
-  created() {
-
+  computed:{
+    zhuangtai(){
+      return  !!~['WAIT'].indexOf(this.orderDetail.status)?2:!!~['OVER'].indexOf(this.orderDetail.status)?3:-1
+    }
+  },
+  watch: {
+    detailsId: {
+      handler(newVal, oldVal) {
+        this.getEsOrderDetail()
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   methods: {
-
+    getEsOrderDetail(){
+      esOrderDetailRefund({
+        esOrderRefundId: this.detailsId
+      }).then(res=>{
+        this.orderDetail = {
+          ...res.data
+        }
+      })
+    },
+    faqituikuan(){
+      this.$refs.formTHref.validate((valid) => {
+        if (valid) {
+          esOrderRefundPrice({
+            ...this.formTH,
+            esOrderRefundId: this.detailsId
+          }).then(res=>{
+            this.$message({ type: 'success', message: `确定退货退款成功!` })
+            this.$emit("removeTab")
+          })
+        }
+      });
+    },
   }
 }
 </script>

src/views/secondHandMall/activistOrder/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,107 +59,90 @@
                   <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="WAIT"></el-tab-pane>
+                      <el-tab-pane label="已完成" name="OVER"></el-tab-pane>
                     </el-tabs>
                   </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">
                           <span class="item product">商品信息</span>
                         </el-col>
                         <el-col :span="3" style="text-align: right"><span class="item">单价(元)/数量</span></el-col>
-                        <el-col :span="4" style="text-align: center"><span class="item">买家信息</span></el-col>
-                        <el-col :span="4" style="text-align: center"><span class="item">收货信息</span></el-col>
-                        <el-col :span="4" style="text-align: center"><span class="item">实付金额</span></el-col>
-                        <el-col :span="3" style="text-align: center"><span class="item">订单状态</span></el-col>
+                        <el-col :span="3" style="text-align: center"><span class="item">买家信息</span></el-col>
+                        <el-col :span="3" style="text-align: center"><span class="item">收货信息</span></el-col>
+                        <el-col :span="3" style="text-align: center"><span class="item">订单金额</span></el-col>
+                        <el-col :span="3" style="text-align: center"><span class="item">退款金额</span></el-col>
+                        <el-col :span="3" style="text-align: center"><span class="item">状态</span></el-col>
                         <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.esOrderRefundId }}</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%;">
+                          <el-col :span="3" 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%;">
+                          <el-col :span="3" 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%;">
+                          <el-col :span="3" 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 class="totalprice">￥{{ order.refundPrice }}</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">{{ ({WAIT: "平台处理", OVER: "完成"})[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-button @click="viewDetails" type="text" size="small">查看详情</el-button>
+                                <el-button @click="viewDetails(order)" type="text" size="small">查看详情</el-button>
                               </div>
                             </div>
                           </el-col>
@@ -191,7 +165,10 @@
           </div>
           <!-- 查看详情 -->
           <div v-if="activeKey == 'details'" style="width:100%;height:100%;">
-            <detailsV/>
+            <detailsV :detailsId="detailsId" @removeTab="()=>{
+              getList()
+              data.removeTab()
+            }"/>
           </div>
         </template>
       </zj-tab-page>
@@ -201,9 +178,10 @@
 </template>
 
 <script>
-import { esOrderList } from "@/api/orderManagement";
+import { esOrderListRefund } from "@/api/orderManagement";
 import detailsV from "./details.vue"
 import '@/styles/order-list.scss'
+import { downloadFiles } from '@/utils/util'
 export default {
   components: {detailsV},
   data() {
@@ -222,28 +200,19 @@ export default {
         sendStatus: '', // 派单异常
         workerOrderNo: '', // 信息编号
       },
-      screen_status: [ // 筛选字段 - 状态
-        { label: '待付款', value: 'NOPAY' },
-        { label: '待发货', value: 'DFH' },
-        { label: '已发货', value: 'YFH' },
-        { label: '已完成', value: 'OVER' },
-        { label: '已退款', value: 'CLOSE' }
-      ],
       tabCurrent: 'ALL',
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [],
+      detailsId: "",
     }
   },
-  computed: {
-
-  },
   created() {
     this.getList();
   },
   methods: {
-    viewDetails(){
+    viewDetails(row, type){
       this.$refs.tabPage.addTab({
         // 对应显示的模块
         activeKey: "details",
@@ -253,7 +222,7 @@ export default {
         label: "订单详情",
         // 打开时事件
         triggerEvent: () => {
-        
+          this.detailsId = row.esOrderRefundId
         },
         // 关闭时事件
         closeEvent: () => {
@@ -281,7 +250,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize
       };
-      esOrderList(params).then(res => {
+      esOrderListRefund(params).then(res => {
         res.data.records.forEach(item => {
           item.selected = false;
         });
@@ -289,16 +258,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;
@@ -315,6 +280,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/listExcelRefund', params);
+    },
   }
 }
 

src/views/secondHandMall/orderManagement/deliverGoods.vue

@@ -1,72 +0,0 @@
-<template>
-  <zj-page-container>
-    <zj-page-fill>
-      <div style="box-sizing: border-box; padding:10px;">
-        <zj-form-container ref="formRef" :form-data="formData" :form-attributes="{ size: 'mini' }">
-          <zj-form-module title="客户信息" label-width="80px" :form-data="formData" :form-items="formItems" />
-          <zj-form-module title="商品信息" label-width="80px" :form-data="formData" :form-items="formItems2" />
-        </zj-form-container>
-      </div>
-    </zj-page-fill>
-  </zj-page-container>
-</template>
-
-<script>
-export default {
-  components: {ImageUpload},
-  data(){
-    return {
-      formData: {
-        imgSrc: [],
-        promotionQuestionnaireQrcodes: []
-      }
-    }
-  },
-  computed: {
-    formItems(){
-      return [{
-        name: 'el-radio',
-        options: [
-          { label: '一级能效', value: "一级能效" },
-          { label: '二级能效', value: "二级能效" },
-        ],
-        md: 24,
-        attributes: { disabled: this.disabled },
-        formItemAttributes: { label: '发货方式', prop: 'mark' }
-      },{
-        name: 'el-input',
-        md: 12,
-        attributes: { disabled: false },
-        formItemAttributes: { label: '物流公司', prop: 'categoryName' }
-      },{
-        name: 'el-input',
-        md: 12,
-        attributes: { disabled: false },
-        formItemAttributes: { label: '快递单号', prop: 'categoryName' }
-      }]
-    },
-    formItems2(){
-      return [{
-          name: 'slot-component',
-          md: 24,
-          formItemAttributes: {
-            label: '',
-            'label-width': '0px',
-            prop: 'promotionQuestionnaireQrcodes',
-            rules: []
-          },
-          render: (h, { props, onInput }) => {
-            var { value } = props
-            return null
-          }
-        }]
-    }
-  },
-  methods: {
-    
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/secondHandMall/orderManagement/details.vue

@@ -241,6 +241,7 @@ export default {
       this.$refs.formTHref.validate((valid) => {
         if (valid) {
           esOrderRefund({
+            esOrderId: this.detailsId,
             ...this.formTH
           }).then(res=>{
             this.$message({ type: 'success', message: `确定退货退款成功!` })
@@ -253,6 +254,7 @@ export default {
       this.$refs.formSKref.validate((valid) => {
         if (valid) {
           esOrderPayPrice({
+            esOrderId: this.detailsId,
             ...this.formSK
           }).then(res=>{
             this.$message({ type: 'success', message: `确认收款成功!` })

src/views/secondHandMall/orderManagement/index.vue

@@ -241,13 +241,6 @@ export default {
         sendStatus: '', // 派单异常
         workerOrderNo: '', // 信息编号
       },
-      screen_status: [ // 筛选字段 - 状态
-        { label: '待付款', value: 'NOPAY' },
-        { label: '待发货', value: 'DFH' },
-        { label: '已发货', value: 'YFH' },
-        { label: '已完成', value: 'OVER' },
-        { label: '已退款', value: 'CLOSE' }
-      ],
       tabCurrent: 'ALL',
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量