Merge remote-tracking branch 'origin/master'

rk

21 小时以前 fa4c7baec36d58b4bdca66159ece743b5a45a9c8

 admin/src/views/business/orderManagement.vue

@@ -4,8 +4,8 @@
      <el-form-item label="订单编号" prop="code">
        <el-input v-model="searchForm.code" clearable placeholder="请输入订单编号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="物品信息" prop="goodsInfo">
        <el-input v-model="searchForm.goodsInfo" clearable placeholder="请输入物品信息" @keypress.enter.native="search"></el-input>
      <el-form-item label="收件信息" prop="takeKeyword">
        <el-input v-model="searchForm.takeKeyword" clearable placeholder="请输入收件人或收件人电话" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建时间" prop="createTime1">
        <el-date-picker type="daterange" v-model="searchForm.createTime1" clearable value-format="yyyy-MM-dd"
@@ -19,7 +19,7 @@
      </el-form-item>
      <el-form-item label="类型" prop="type">
        <el-select v-model="searchForm.type" clearable placeholder="请选择类型" @change="search">
          <el-option label="就地存取" :value="0"></el-option>
          <el-option label="就地寄存" :value="0"></el-option>
          <el-option label="同城寄送" :value="1"></el-option>
        </el-select>
      </el-form-item>
@@ -57,13 +57,38 @@
      >
        <el-table-column prop="code" label="订单编号" min-width="160px">
          <template slot-scope="{row}">
            <span class="order-no" @click="handleOrderDetail(row)">{{ row.code }}</span>
            <span class="order-no" @click="handleOrderDetail(row.id)">{{ row.code }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="code" label="关联原订单" min-width="160px">
          <template slot-scope="{row}">
            <span class="order-no" style="color: red;" @click="handleOrderDetail(row.relationOrderId)">{{ row.relationOrderCode }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="goodsInfo" label="物品信息" min-width="120px"></el-table-column>

        <el-table-column prop="goodsInfo" label="收件信息" min-width="140px">
          <template slot-scope="{row}">
            {{ row.takeUser || '-' }} 
            {{ row.takePhone || '-' }}
          </template>
        </el-table-column>
        <el-table-column prop="goodsInfo" label="寄件门店" min-width="120px">
          <template slot-scope="{row}">
            {{ row.depositShopName || '-' }}
          </template>
        </el-table-column>
        <el-table-column prop="goodsInfo" label="收件门店" min-width="120px">
          <template slot-scope="{row}">
            <template v-if="row.type !== 0 && row.takeShopId">
              {{ row.takeShopName || '-' }}
            </template>
          </template>
        </el-table-column>
        
        <el-table-column label="类型" min-width="80px">
          <template slot-scope="{row}">
            <span v-if="row.type === 0">就地存取</span>
            <span v-if="row.type === 0">就地寄存</span>
            <span v-else-if="row.type === 1">同城寄送</span>
            <span v-else>-</span>
          </template>
@@ -93,10 +118,13 @@
          <template slot-scope="{row}">¥{{ (row.overdueAmount / 100).toFixed(2) }}</template>
        </el-table-column>
        <el-table-column label="异常金额" min-width="100px">
          <template slot-scope="{row}">¥{{ ((row.exceptionAmount || 0) / 100).toFixed(2) }}</template>
          <template slot-scope="{row}">¥{{ ((row.exceptionFee || 0) / 100).toFixed(2) }}</template>
        </el-table-column>
        <el-table-column label="优惠券折扣" min-width="100px">
        <el-table-column label="优惠卷抵扣" min-width="100px">
          <template slot-scope="{row}">¥{{ ((row.deductionAmount || 0) / 100).toFixed(2) }}</template>
        </el-table-column>
        <el-table-column label="门店保管补贴" min-width="100px">
          <template slot-scope="{row}">¥{{ ((row.shopCompensationAmount || 0) / 100).toFixed(2) }}</template>
        </el-table-column>
        <el-table-column  prop="statusDesc"  label="订单状态" min-width="100px">
          <template slot-scope="{row}">
@@ -108,17 +136,17 @@
        <el-table-column  label="结算状态" min-width="100px">
          <template slot-scope="{row}">
            <span :style="{ color: row.settlementStatus === 1 ? '#67c23a' : '#e6a23c' }">
              {{ row.settlementStatus === 1 ? '已结算' : '未结算' }}
              {{ row.settlementStatus === 1 ? '已结算' : '待结算' }}
            </span>
          </template>
        </el-table-column>
        <el-table-column prop="payTime" label="支付时间" min-width="150px"> </el-table-column>
        <el-table-column prop="createTime" label="创建时间" min-width="150px"> </el-table-column>
        <el-table-column label="操作" min-width="120" fixed="right">
        <el-table-column label="操作" min-width="180" fixed="right">
          <template slot-scope="{row}">
            <el-button type="text" v-if="row.status === 2" @click="handleDispatch(row)">手动派单</el-button>
            <el-button type="text" v-if="row.status === 7 && row.manualRefund === 0" @click="handleManualRefund(row)">手动退款</el-button>
            <el-button type="text" v-if="row.status === 2">异常派单</el-button>
            <el-button type="text" v-if="row.status === 7 && row.exceptionStatus !== 1" @click="handleManualRefund(row)">手动退款</el-button>
            <el-button type="text" v-if="row.status === 4 && !row.takeShopId && row.exceptionStatus !== 1" @click="handleAbnormal(row)">异常派单</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -131,6 +159,7 @@
    <OperaDispatch ref="operaDispatch" @success="handlePageChange" />
    <OperaOrderDetail ref="operaOrderDetail"  @success="handlePageChange"  />
    <OperaManualRefund ref="operaManualRefund" @success="handlePageChange" />
    <OperaAbnormal ref="operaAbnormal" @success="handlePageChange" />
  </TableLayout>
</template>

@@ -141,15 +170,16 @@
import OperaDispatch from '@/components/business/OperaDispatch'
import OperaOrderDetail from '@/components/business/OperaOrderDetail'
import OperaManualRefund from '@/components/business/OperaManualRefund'
import OperaAbnormal from '@/components/business/OperaAbnormal'
export default {
  name: 'OrderManagement',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaDispatch, OperaOrderDetail, OperaManualRefund },
  components: { TableLayout, Pagination, OperaDispatch, OperaOrderDetail, OperaManualRefund, OperaAbnormal }, 
  data () {
    return {
      searchForm: {
        code: '',
        goodsInfo: '',
        takeKeyword: '',
        createTime1: '',
        createStartTime: '',
        createEndTime: '',
@@ -169,6 +199,9 @@
    this.search()
  },
  methods: {
    handleAbnormal (row) {
      this.$refs.operaAbnormal.open('异常派单', row)
    },
    handleDateChange (val) {
      this.searchForm.createStartTime = val ? val[0] : ''
      this.searchForm.createEndTime = val ? val[1] : ''
@@ -199,8 +232,8 @@
      // 异常派单逻辑
      this.$message.info('异常派单功能待实现')
    },
    handleOrderDetail (row) {
      this.$refs.operaOrderDetail.open(row)
    handleOrderDetail (id) {
      this.$refs.operaOrderDetail.open(id)
    }
  }
}