新增换藏订单

src/api/business/order.js

@@ -7,6 +7,13 @@ export function requestOrderList(data) {
     data
   })
 }
+export function requestChangeOrderList(data) {
+  return request({
+    url: '/exchangeApplyOrder/findList',
+    method: 'post',
+    data
+  })
+}
 export function requestLogisticsList(data) {
   return request({
     url: '/sysDistributionOrder/getLogisticsList',
@@ -44,6 +51,14 @@ export function requestIdentify(data) {
   })
 }
 
+export function exchangeApplyOrderIdentify(data) {
+  return request({
+    url: '/exchangeApplyOrder/handleApplyOrder',
+    method: 'post',
+    data
+  })
+}
+
 export function requestIdentifyDelivery(data) {
   return request({
     url: '/identifyOrder/delivery',
@@ -73,6 +88,13 @@ export function findOrderBillDetail(data) {
     data
   })
 }
+export function exchangeApplyOrderDetail(data) {
+  return request({
+    url: '/exchangeApplyOrder/findDetail',
+    method: 'post',
+    data
+  })
+}
 
 export function findUserBill(data) {
   return request({

src/router/index.js

@@ -648,6 +648,42 @@ export const asyncRouterMap = [
           keepAlive: true
         },
         hidden: true
+      }, {
+        path: 'ChangeOrderDetail',
+        component: () => import('@/views/order/ChangeOrderDetail'),
+        name: 'ChangeOrderDetail',
+        meta: {
+          perms: [],
+          title: '交换订单详情页',
+          icon: 'list',
+          noCache: true,
+          keepAlive: true
+        },
+        hidden: true
+      }, {
+        path: 'ChangeOrderDetailnew',
+        component: () => import('@/views/order/ChangeOrderDetailnew'),
+        name: 'ChangeOrderDetailnew',
+        meta: {
+          perms: [],
+          title: '交换订单详情页',
+          icon: 'list',
+          noCache: true,
+          keepAlive: true
+        },
+        hidden: true
+      }, {
+        path: 'UserChangeOrderView',
+        component: () => import('@/views/order/UserChangeOrderView'),
+        name: 'UserChangeOrderView',
+        meta: {
+          perms: [],
+          title: '交换订单列表',
+          icon: 'list',
+          noCache: true,
+          keepAlive: true
+        },
+        hidden: true
       }
     ]
   },

src/views/order/ChangeOrderView.vue

@@ -138,22 +138,23 @@
           <span class="tooltip-span">{{ `${scope.row.waybill || '-'}` }}</span>
         </template>
       </el-table-column>
-      <!--      <el-table-column align="center" label="操作" width="300">
+       <!--  中转单状态 (12, "待平台收货"), (13, "平台鉴定中"), (14, "待平台发货"), (15, "待平台退回"), (16, "平台已发货"), (17, "退回待收货"), (18, "退回已收货"),-->
+       <el-table-column align="center" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
-            :disabled="(!scope.row.editAble && scope.row.type === 2)"
             type="primary"
             size="mini"
-            @click="handleToDetail(scope.row)">编辑
+            @click="handleToOrderDetail(scope.row)">详情
           </el-button>
           <el-button
-            :disabled="(!scope.row.editAble && scope.row.type === 2)"
-            type="danger"
+            type="primary"
             size="mini"
-            @click="handleDelete(scope.row)">删除
+            @click="handleToOrderDetail(scope.row)">订单
           </el-button>
         </template>
-      </el-table-column>-->
+      </el-table-column>
+
+     
 
     </el-table>
 
@@ -263,6 +264,21 @@ export default {
     handleToDetailuser(item) {
       this.$router.push({ path: '/sale/itemDetail', query: { id: item.itemId }})
     },
+    /**
+     * 详情
+     * @param item
+     */
+    handleToOrderDetail(item) {
+      this.$router.push({ path: '/order/ChangeOrderDetail', query: { id: item.itemId }})
+    },
+    /**
+     * 订单
+     * @param item
+     */
+    handleToOrderDetail(item) {
+      this.$router.push({ path: '/order/ChangeOrderDetail', query: { distributionOrderId: item.distributionOrderId }})
+    },
+    
     getList() {
       localStorage.setItem('systemState', '')
       this.listLoading = true

src/views/order/UserChangeOrderView.vue

+<template>
+  <div class="page_consignList">
+    <div class="filter-container">
+      <div class="button_left">
+        <el-input v-model="listQuery.exchangeApplyOrderId" clearable class="filter-item" style="width: 200px;" placeholder="请输入交换编号"/>
+        <el-input
+          v-model="listQuery.distributionOrderId"
+          clearable
+          class="filter-item"
+          style="width: 200px;"
+          placeholder="请输入订单编号" />
+        <el-select v-model="listQuery.state" placeholder="请选择交换单状态" class="filter-item" style="width: 200px;">
+          <el-option
+            v-for="item in options"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            size="mini"/>
+        </el-select>
+        <el-input v-model="listQuery.itemName" clearable class="filter-item" style="width: 200px;" placeholder="请输入申请方藏品名称"/>
+        <el-input v-model="listQuery.sellerName" clearable class="filter-item" style="width: 200px;" placeholder="请输入受理方藏家名称"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 12px" @click="handleFilter">查找</el-button>
+        <el-button class="filter-item" @click="resetSearchForm">重置</el-button>
+      </div>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      size="small"
+      element-loading-text="正在查询中..."
+      border
+      fit
+      highlight-current-row>
+      <el-table-column align="center" min-width="180px" prop="exchangeApplyOrderId" label="交换单号" />
+      <!-- <el-table-column align="center" label="申请方昵称" min-width="150px" prop="sellerName">
+        <template slot-scope="scope">
+          <Line2Hidden :text="scope.row.sellerName || ''" />
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column align="center" label="申请方藏品估价" min-width="120px" prop="amount" /> -->
+      <!-- <el-table-column align="center" label="受理方昵称" min-width="90px" prop="sellerName" /> -->
+      <el-table-column align="center" label="申请方藏品图片" min-width="120px" prop="homePageImage">
+        <template slot-scope="scope">
+          <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->
+          <div v-if="scope.row.userItemList && scope.row.userItemList.length > 0" class="image_preview">
+            <el-image
+              :preview-src-list="[scope.row.userItemList[0].homePageImage.url]"
+              :src="scope.row.userItemList[0].homePageImage.url"
+              class="table-td-thumb"
+            />
+          </div>
+        </template>
+      </el-table-column>
+  
+      <el-table-column align="center" label="申请方藏品名称" min-width="200px" prop="userExchangeItemName">
+        <template slot-scope="scope">
+          <div class="user_self" @click="handleToDetailuser(scope.row)">{{ scope.row.userItemList[0].name}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="受理方藏品图片" min-width="120px" prop="homePageImage">
+        <template slot-scope="scope">
+          <!-- <img v-if="scope.row.homePageImage && scope.row.homePageImage.url" :src="scope.row.homePageImage.url" width="60px" height="60px"> -->
+          <div v-if="scope.row.targetItemList && scope.row.targetItemList.length > 0" class="image_preview">
+            <el-image
+              :preview-src-list="[scope.row.targetItemList[0].homePageImage.url]"
+              :src="scope.row.targetItemList[0].homePageImage.url"
+              class="table-td-thumb"
+            />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="受理方藏品标题" min-width="200px" prop="name">
+        <template slot-scope="scope">
+          <div class="user_self" @click="handleToDetail(scope.row)">{{ scope.row.targetItemList[0].name}}</div>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column align="center" label="受理方藏品估价" prop="userExchangeItemOfficalPrice" /> -->
+      <el-table-column align="center" label="申请时间" min-width="200px" prop="createTime" />
+      <el-table-column align="center" label="订单状态" prop="stateName" />
+      <!-- <el-table-column align="center" label="用户寄出物流公司" prop="fromLogisticsName">
+      </el-table-column> -->
+       <!--  中转单状态 (12, "待平台收货"), (13, "平台鉴定中"), (14, "待平台发货"), (15, "待平台退回"), (16, "平台已发货"), (17, "退回待收货"), (18, "退回已收货"),-->
+       <el-table-column align="center" label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            size="mini"
+            @click="handleToOrderDetailnew(scope.row)">详情
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <Pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.limit"
+      @pagination="getList" />
+
+  </div>
+</template>
+
+<script>
+import Line2Hidden from '@/components/line2Hidden'
+import Pagination from '@/components/Pagination'
+import { requestChangeOrderList } from '@/api/business/order'
+
+export default {
+  name: 'UserChangeOrderView',
+  components: {
+    Pagination,
+    Line2Hidden
+  },
+  data() {
+    return {
+      activeIndex: '1',
+      itemKey: 0,
+      options: [{
+        value: 0,
+        label: '待处理'
+      }, {
+        value: -1,
+        label: '取消'
+      }, {
+        value: 1,
+        label: '同意'
+      }],
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20,
+      },
+      list: [],
+      total: 0,
+      // 图文估价
+      imageValueDialogShow: false,
+      // 建议寄售价
+      identifyValueDialogShow: false,
+      // 货品售出
+      finishDialogShow: false,
+      // 寄售凭证
+      finishSettlementDialogShow: false,
+      // 取消
+      cancelConsignDialogShow: false,
+      currentSaleId: ''
+    }
+  },
+  created() {
+    this.getList()
+  },
+
+  methods: {
+
+    resetSearchForm() {
+      this.listQuery = {
+        page: 1,
+        limit: 20,
+      }
+      this.getList()
+    },
+    handleFilter() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+
+    handlerGetList() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleClick(tab, event) {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleToDetail(item) {
+      this.$router.push({ path: '/sale/itemDetail', query: { id: item.targetItemList[0].itemId}})
+    },
+    handleToDetailuser(item) {
+      this.$router.push({ path: '/sale/itemDetail', query: { id: item.userItemList[0].itemId}})
+    },
+    /**
+     * 详情
+     * @param item
+     */
+    handleToOrderDetail(item) {
+      this.$router.push({ path: '/order/ChangeOrderDetail', query: { id: item.itemId }})
+    },
+    /**
+     * 订单
+     * @param item
+     */
+    handleToOrderDetailnew(item) {
+      this.$router.push({ path: '/order/ChangeOrderDetailnew', query: { exchangeApplyOrderId: item.exchangeApplyOrderId }})
+    },
+    getList() {
+      this.listLoading = true
+      requestChangeOrderList(this.listQuery).then(response => {
+        this.list = response.data.data.dataList
+        this.total = response.data.data.total
+        this.listLoading = false
+      }).catch((e) => {
+        console.log('===报错=', e)
+        this.list = []
+        this.total = 0
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/ .el-switch {
+  height: 30px;
+}
+
+/deep/ .cell {
+  display: flex;
+  justify-content: center;
+}
+
+.page_consignList {
+  padding: 20px;
+  .filter-container {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+}
+.image_preview {
+    width: 60px;
+    height: 60px;
+    align-content: center;
+    justify-content: center;
+  }
+  .user_self {
+    color: #409EFF;
+  }
+  .table-td-thumb {
+    width: 60px;
+    height: 60px;
+  }
+</style>

src/views/order/components/ReturnLogisticIdentifyDialog.vue

@@ -34,7 +34,7 @@
 
 <script>
 import { MessageBox } from 'element-ui'
-import { requestIdentifyDelivery, requestIdentifySendBack, requestLogisticsList } from '@/api/business/order'
+import { requestIdentifyDelivery, requestIdentifySendBack, requestLogisticsList, requestDelivery} from '@/api/business/order'
 export default {
   name: 'ReturnLogisticIdentifyDialog',
   props: {
@@ -138,7 +138,24 @@ export default {
                   type: 'error'
                 })
               })
-          } else {
+          } if (this.type === 3) {
+            requestDelivery(params)
+              .then(response => {
+                this.itemContent = {}
+                this.logisticForm = {}
+                this.$notify.success({
+                  message: '发货成功'
+                })
+                this.$emit('refreshDelivery')
+              })
+              .catch(response => {
+                MessageBox.alert('业务错误：' + response.data.errmsg, '警告', {
+                  confirmButtonText: '确定',
+                  type: 'error'
+                })
+              })
+          }
+          else {
             requestIdentifySendBack(params)
               .then(response => {
                 this.itemContent = {}

src/views/order/itemOrderList.vue

@@ -4,6 +4,7 @@
       <el-menu-item index="1">藏馆订单</el-menu-item>
       <el-menu-item index="2">平台中转</el-menu-item>
       <el-menu-item index="3">换藏订单</el-menu-item>
+      <el-menu-item index="4">交换订单</el-menu-item>
     </el-menu>
     <div v-if="activeIndex === '1'">
       <SaleOrderView />
@@ -11,9 +12,12 @@
     <div v-else-if="activeIndex === '2'">
       <TransferOrderView />
     </div>
-    <div v-else="activeIndex === '3'">
+    <div v-else-if="activeIndex === '3'">
       <ChangeOrderView />
     </div>
+    <div v-else="activeIndex === '4'">
+      <UserChangeOrderView />
+    </div>
   </div>
 </template>
 
@@ -21,17 +25,19 @@
 import SaleOrderView from './saleOrderView'
 import TransferOrderView from './transferOrderView'
 import ChangeOrderView from './ChangeOrderView'
+import UserChangeOrderView from './UserChangeOrderView'
 
 export default {
   name: 'ItemOrderList',
   components: {
     TransferOrderView,
     SaleOrderView,
-    ChangeOrderView
+    ChangeOrderView,
+    UserChangeOrderView
   },
   data() {
     return {
-      activeIndex: '3',
+      activeIndex: '4',
       listLoading: true
     }
   },

src/views/order/transferOrderDetail.vue

@@ -35,7 +35,7 @@
     </div>
     <el-card class="box-card" style="margin: 0 16px">
       <div class="title">
-        <div class="title_content">订单信息</div>
+        <div class="title_content">申请者相关信息</div>
         <el-button v-if="itemContent.transferStateName" type="warning" plain size="mini">{{ itemContent.transferStateName }}</el-button>
       </div>
       <div class="user_info flex">