Merge remote-tracking branch 'origin/feature/20240301_1544_sale' into release_pre_20240523160255

src/api/business/dashboard.js

@@ -15,3 +15,10 @@ export function chart(query) {
     params: query
   })
 }
+export function requestDataPanel(data) {
+  return request({
+    url: '/dashboard/dataPanel',
+    method: 'post',
+    data
+  })
+}

src/api/business/order.js

@@ -22,3 +22,48 @@ export function requestDelivery(data) {
   })
 }
 
+export function requestTransferOrderList(data) {
+  return request({
+    url: '/identifyOrder/findList',
+    method: 'post',
+    data
+  })
+}
+export function requestSigned(data) {
+  return request({
+    url: '/identifyOrder/signed',
+    method: 'post',
+    data
+  })
+}
+export function requestIdentify(data) {
+  return request({
+    url: '/identifyOrder/identify',
+    method: 'post',
+    data
+  })
+}
+
+export function requestIdentifyDelivery(data) {
+  return request({
+    url: '/identifyOrder/delivery',
+    method: 'post',
+    data
+  })
+}
+
+export function requestIdentifySendBack(data) {
+  return request({
+    url: '/identifyOrder/sendBack',
+    method: 'post',
+    data
+  })
+}
+export function requestTransferDetail(data) {
+  return request({
+    url: '/identifyOrder/findDetail',
+    method: 'post',
+    data
+  })
+}
+

src/router/index.js

@@ -514,7 +514,7 @@ export const asyncRouterMap = [
     },
     children: [
       {
-        path: 'saleList',
+        path: 'itemOrderList',
         component: () => import('@/views/order/itemOrderList'),
         name: 'itemOrderList',
         meta: {
@@ -535,6 +535,18 @@ export const asyncRouterMap = [
           noCache: true,
           keepAlive: true
         }
+      }, {
+        path: 'transferOrderDetail',
+        component: () => import('@/views/order/transferOrderDetail'),
+        name: 'transferOrderDetail',
+        meta: {
+          perms: [],
+          title: '订单详情',
+          icon: 'list',
+          noCache: true,
+          keepAlive: true
+        },
+        hidden: true
       }
     ]
   },

src/views/dashboard/old.vue

+<template>
+  <div class="dashboard-editor-container">
+
+    <el-row :gutter="40" class="panel-group">
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+          <div class="card-panel-icon-wrapper icon-people">
+            <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">用户数量</div>
+            <count-to :start-val="0" :end-val="userTotal" :duration="2600" class="card-panel-num"/>
+          </div>
+        </div>
+      </el-col>
+      <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+        <div class="card-panel" @click="handleSetLineChartData('messages')">
+          <div class="card-panel-icon-wrapper icon-message">
+            <svg-icon icon-class="message" class-name="card-panel-icon" />
+          </div>
+          <div class="card-panel-description">
+            <div class="card-panel-text">藏品数量</div>
+            <count-to :start-val="0" :end-val="goodsTotal" :duration="3000" class="card-panel-num"/>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="userOrderCnt" />
+    </el-row>
+
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="16">
+        <div class="chart-wrapper">
+          <bar-chart :chart-data="orderAmts"/>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart :chart-data="categorySell"/>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { info, chart } from '@/api/business/dashboard'
+import CountTo from 'vue-count-to'
+import LineChart from './LineChart'
+import PieChart from './PieChart'
+import BarChart from './BarChart'
+
+export default {
+  components: {
+    CountTo,
+    LineChart,
+    PieChart,
+    BarChart
+  },
+  data() {
+    return {
+      userTotal: 0,
+      goodsTotal: 0,
+      productTotal: 0,
+      orderTotal: 0,
+      userOrderCnt: { dayData: [], userCnt: [], orderCnt: [] },
+      orderAmts: { dayData: [], orderAmtData: [], orderCntData: [] },
+      categorySell: { categoryNames: [], categorySellData: [] }
+    }
+  },
+  mounted() {
+  },
+  created() {
+    chart().then(response => {
+      this.userOrderCnt = response.data.data.userOrderCnt
+      this.orderAmts = response.data.data.orderAmts
+      this.categorySell = response.data.data.categorySell
+    })
+    info().then(response => {
+      this.userTotal = response.data.data.userTotal
+      this.goodsTotal = response.data.data.goodsTotal
+      this.productTotal = response.data.data.productTotal
+      this.orderTotal = response.data.data.orderTotal
+    })
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit('handleSetLineChartData', type)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+
+.panel-group {
+  margin-top: 18px;
+
+  .card-panel-col{
+    margin-bottom: 32px;
+  }
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+      .icon-people {
+         background: #40c9c6;
+      }
+      .icon-message {
+        background: #36a3f7;
+      }
+      .icon-money {
+        background: #f4516c;
+      }
+      .icon-shoppingCard {
+        background: #34bfa3
+      }
+    }
+    .icon-people {
+      color: #40c9c6;
+    }
+    .icon-message {
+      color: #36a3f7;
+    }
+    .icon-money {
+      color: #f4516c;
+    }
+    .icon-shoppingCard {
+      color: #34bfa3
+    }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+</style>

src/views/order/components/NoPassIdentifyDialog.vue

+<template>
+
+  <el-dialog
+    v-if="showNoPassIdentifyDialogShow"
+    :visible.sync="showNoPassIdentifyDialogShow"
+    :before-close="handleCancelConsignDialog"
+    width="600px"
+    height="600px"
+    title="平台鉴定结果">
+    <el-form ref="cancel" :model="cancelForm" :rules="cancelRules">
+      <el-form-item label="" label-width="80px" prop="content">
+        <div>该藏品未通过平台鉴定，请描述原因：</div>
+      </el-form-item>
+      <el-form-item label="" label-width="80px" prop="remark">
+        <el-input
+          v-model="cancelForm.remark"
+          :autosize="{ minRows: 8, maxRows: 8}"
+          style="width: 400px"
+          maxlength="50"
+          type="textarea"
+          show-word-limit
+          placeholder="该藏品未通过平台鉴定，请描述原因：" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancelConsignDialog">取 消</el-button>
+      <el-button type="primary" @click="handleCancelValue">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { MessageBox } from 'element-ui'
+import { requestIdentify } from '@/api/business/order'
+export default {
+  name: 'NoPassIdentifyDialog',
+  props: {
+    showNoPassIdentifyDialogShow: {
+      type: Boolean,
+      default: false
+    },
+    distributionOrderId: {
+      type: String,
+      default: ''
+    },
+    identifyOrderId: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      cancelForm: {
+        remark: ''
+      },
+      cancelRules: {
+        remark: [
+          { required: true, message: '原因不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    handleCancelConsignDialog() {
+      this.$emit('cancelDialog')
+    },
+    /**
+     * 取消
+     */
+    handleCancelValue() {
+      if (this.distributionOrderId) {
+        const params = { ...this.cancelForm, distributionOrderId: this.distributionOrderId, identifyOrderId: this.identifyOrderId, approved: 0 }
+        this.$refs.cancel.validate((valid) => {
+          if (valid) {
+            requestIdentify(params)
+              .then(response => {
+                this.$notify.success({
+                  message: '操作成功'
+                })
+                this.$emit('refreshItem', this.distributionOrderId)
+              })
+              .catch(response => {
+                MessageBox.alert('业务错误：' + response.data.errmsg, '警告', {
+                  confirmButtonText: '确定',
+                  type: 'error'
+                })
+              })
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  text-align: center;
+}
+
+.image {
+  width: 400px;
+  height: auto;
+}
+
+</style>

src/views/order/components/ReturnLogisticIdentifyDialog.vue

+<template>
+  <el-dialog
+    v-if="logisticDialogShow"
+    :visible.sync="logisticDialogShow"
+    :before-close="handleCancelLogisticDialog"
+    width="600px"
+    height="800px"
+    title="寄出快递">
+    <el-form ref="imageValue" :model="logisticForm" :rules="logisticRules">
+      <el-form-item label="物流公司" label-width="100px" prop="outLogisticsCode">
+        <el-select v-model="logisticForm.outLogisticsCode" placeholder="请选择物流公司" style="width: 240px;margin-right: 10px;margin-bottom: 10px">
+          <el-option
+            v-for="item in logisticList"
+            :key="item.code"
+            :label="item.name"
+            :value="item.code"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="快递单号" label-width="100px" prop="outWaybill">
+        <el-input
+          v-model="logisticForm.outWaybill"
+          clearable
+          class="filter-item"
+          style="width: 240px;margin-right: 10px"
+          placeholder="请输入快递单号" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancelLogisticDialog">取 消</el-button>
+      <el-button type="primary" @click="handleLogistic">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { MessageBox } from 'element-ui'
+import { requestIdentifyDelivery, requestIdentifySendBack, requestLogisticsList } from '@/api/business/order'
+export default {
+  name: 'ReturnLogisticIdentifyDialog',
+  props: {
+    logisticDialogShow: {
+      type: Boolean,
+      default: false
+    },
+    distributionOrderId: {
+      type: String,
+      default: ''
+    },
+    identifyOrderId: {
+      type: String,
+      default: ''
+    },
+    type: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      logisticForm: {
+        outLogisticsCode: '',
+        outWaybill: ''
+      },
+      logisticRules: {
+        outLogisticsCode: [
+          { required: true, message: '请选择物流公司', trigger: 'blur' }
+        ],
+        outWaybill: [
+          { required: true, message: '请输入快递单号', trigger: 'blur' }
+        ]
+      },
+      logisticList: [
+        {
+          'code': 'JD',
+          'name': '京东快递'
+        },
+        {
+          'code': 'SF',
+          'name': '顺丰快递'
+        },
+        {
+          'code': 'STO',
+          'name': '申通快递'
+        },
+        {
+          'code': 'YTO',
+          'name': '圆通快递'
+        },
+        {
+          'code': 'ZTO',
+          'name': '中通快递'
+        },
+        {
+          'code': 'YUNDA',
+          'name': '韵达快递'
+        }
+      ]
+    }
+  },
+  created() {
+    this.getLogisticsList()
+  },
+  methods: {
+    handleCancelLogisticDialog() {
+      this.$emit('cancelDialog')
+    },
+    /**
+     * 获取物流公司列表
+     */
+    getLogisticsList() {
+      requestLogisticsList().then((response) => {
+        console.log('==response===', response)
+        this.logisticList = response.data.data
+      }).catch((err) => {
+        console.log('==err===', err)
+      })
+    },
+    /**
+     * 实物评估
+     */
+    handleLogistic() {
+      const params = { ...this.logisticForm, distributionOrderId: this.distributionOrderId, identifyOrderId: this.identifyOrderId }
+      this.$refs.imageValue.validate((valid) => {
+        if (valid) {
+          if (this.type === 1) {
+            requestIdentifyDelivery(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 = {}
+                this.logisticForm = {}
+                this.$notify.success({
+                  message: '退回成功'
+                })
+                this.$emit('refreshSendBack')
+              })
+              .catch(response => {
+                MessageBox.alert('业务错误：' + response.data.errmsg, '警告', {
+                  confirmButtonText: '确定',
+                  type: 'error'
+                })
+              })
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  text-align: center;
+}
+
+.image {
+  width: 400px;
+  height: auto;
+}
+
+</style>

src/views/order/itemOrderList.vue

 <template>
   <div class="page_consignList">
-    <div class="filter-container">
-      <div class="button_left">
-        <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>
+    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+      <el-menu-item index="1">藏馆订单</el-menu-item>
+      <el-menu-item index="2">平台中转</el-menu-item>
+    </el-menu>
+    <div v-if="activeIndex === '1'">
+      <SaleOrderView />
+    </div>
+    <div v-else>
+      <TransferOrderView />
     </div>
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      size="small"
-      element-loading-text="正在查询中..."
-      border
-      fit
-      highlight-current-row>
-      <!--      <el-table-column align="center" label="排行" width="100px" type="index" />-->
-      <el-table-column align="center" min-width="100px" prop="distributionOrderId" 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="藏品图片" 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">
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" label="藏品名称" min-width="150px" prop="itemName">
-        <template slot-scope="scope">
-          <Line2Hidden :text="scope.row.itemName" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="数量" prop="itemNum" />
-      <el-table-column align="center" label="订单金额" prop="amount">
-        <template slot-scope="scope">
-          <span class="tooltip-span">{{ `¥ ${scope.row.amount}` }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="下单用户" prop="buyerName" />
-      <el-table-column align="center" label="下单时间" prop="createTime" />
-      <el-table-column align="center" label="收货信息" prop="receiverName" min-width="160px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.receiverName" >{{ scope.row.receiverName + ',' + scope.row.receiverPhone + ',' + scope.row.receiverAddress }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="介绍人" prop="introducerName">
-        <template slot-scope="scope">
-          <span class="tooltip-span">{{ `${scope.row.introducerName || '-'}` }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="订单状态" prop="stateName" />
-      <el-table-column align="center" label="物流公司" prop="logisticsName">
-        <template slot-scope="scope">
-          <span class="tooltip-span">{{ `${scope.row.logisticsName || '-'}` }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="快递单号" prop="waybill">
-        <template slot-scope="scope">
-          <span class="tooltip-span">{{ `${scope.row.waybill || '-'}` }}</span>
-        </template>
-      </el-table-column>
-      <!--      <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)">编辑
-          </el-button>
-          <el-button
-            :disabled="(!scope.row.editAble && scope.row.type === 2)"
-            type="danger"
-            size="mini"
-            @click="handleDelete(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 { requestOrderList } from '@/api/business/order'
+import SaleOrderView from './saleOrderView'
+import TransferOrderView from './transferOrderView'
 
 export default {
   name: 'ItemOrderList',
   components: {
-    Pagination,
-    Line2Hidden
+    TransferOrderView,
+    SaleOrderView
   },
   data() {
     return {
+      activeIndex: '1',
       itemKey: 0,
       options: [{
         value: 1,
@@ -168,6 +76,9 @@ export default {
   },
 
   methods: {
+    handleSelect(value) {
+      this.activeIndex = value
+    },
     resetSearchForm() {
       this.listQuery = {
         page: 1,

src/views/order/saleOrderView.vue

+<template>
+  <div class="page_consignList">
+    <div class="filter-container">
+      <div class="button_left">
+        <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" label="排行" width="100px" type="index" />-->
+      <el-table-column align="center" min-width="100px" prop="distributionOrderId" 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="藏家地址" prop="receiverName" min-width="160px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.receiverName" >{{ scope.row.receiverName + ',' + scope.row.receiverPhone + ',' + scope.row.receiverAddress }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="藏品图片" 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">
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" label="藏品名称" min-width="150px" prop="itemName">
+        <template slot-scope="scope">
+          <Line2Hidden :text="scope.row.itemName" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="数量" prop="itemNum" />
+      <el-table-column align="center" label="订单金额" prop="amount">
+        <template slot-scope="scope">
+          <span class="tooltip-span">{{ `¥ ${scope.row.amount}` }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="下单用户" prop="buyerName" />
+      <el-table-column align="center" label="下单时间" prop="createTime" />
+      <el-table-column align="center" label="收货信息" prop="receiverName" min-width="160px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.receiverName" >{{ scope.row.receiverName + ',' + scope.row.receiverPhone + ',' + scope.row.receiverAddress }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="介绍人" prop="introducerName">
+        <template slot-scope="scope">
+          <span class="tooltip-span">{{ `${scope.row.introducerName || '-'}` }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="订单状态" prop="stateName" />
+      <el-table-column align="center" label="中转状态" prop="transferStateName" >
+        <template slot-scope="scope">
+          <span class="tooltip-span">{{ `${scope.row.transferStateName || '-'}` }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="物流公司" prop="logisticsName">
+        <template slot-scope="scope">
+          <span class="tooltip-span">{{ `${scope.row.logisticsName || '-'}` }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="快递单号" prop="waybill">
+        <template slot-scope="scope">
+          <span class="tooltip-span">{{ `${scope.row.waybill || '-'}` }}</span>
+        </template>
+      </el-table-column>
+      <!--      <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)">编辑
+          </el-button>
+          <el-button
+            :disabled="(!scope.row.editAble && scope.row.type === 2)"
+            type="danger"
+            size="mini"
+            @click="handleDelete(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 { requestOrderList } from '@/api/business/order'
+
+export default {
+  name: 'SaleOrderView',
+  components: {
+    Pagination,
+    Line2Hidden
+  },
+  data() {
+    return {
+      activeIndex: '1',
+      itemKey: 0,
+      options: [{
+        value: 1,
+        label: '待付款'
+      }, {
+        value: 10,
+        label: '待发货'
+      }, {
+        value: 20,
+        label: '待收货'
+      }, {
+        value: 30,
+        label: '售后中'
+      }, {
+        value: 80,
+        label: '退款受理中'
+      }, {
+        value: 100,
+        label: '已完成'
+      }, {
+        value: 101,
+        label: '已取消'
+      }],
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        size: 20,
+        type: 3
+      },
+      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,
+        type: 3
+      }
+      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()
+    },
+    getList() {
+      localStorage.setItem('systemState', '')
+      this.listLoading = true
+      requestOrderList(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;
+  }
+}
+
+</style>