Merge remote-tracking branch 'origin/master'

src/api/oms/order.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单表列表
+export function listOmsOrder(query, pageReq) {
+  return request({
+    url: '/oms/order/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单表详细
+export function getOmsOrder(id) {
+  return request({
+    url: '/oms/order/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单表
+export function addOmsOrder(data) {
+  return request({
+    url: '/oms/order',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单表
+export function updateOmsOrder(data) {
+  return request({
+    url: '/oms/order',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单表
+export function delOmsOrder(id) {
+  return request({
+    url: '/oms/order/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单表
+export function exportOmsOrder(query) {
+  return request({
+    url: '/oms/order/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/oms/orderDeliveryHistory.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单发货记录列表
+export function listOmsOrderDeliveryHistory(query, pageReq) {
+  return request({
+    url: '/oms/orderDeliveryHistory/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单发货记录详细
+export function getOmsOrderDeliveryHistory(id) {
+  return request({
+    url: '/oms/orderDeliveryHistory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单发货记录
+export function addOmsOrderDeliveryHistory(data) {
+  return request({
+    url: '/oms/orderDeliveryHistory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单发货记录
+export function updateOmsOrderDeliveryHistory(data) {
+  return request({
+    url: '/oms/orderDeliveryHistory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单发货记录
+export function delOmsOrderDeliveryHistory(id) {
+  return request({
+    url: '/oms/orderDeliveryHistory/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单发货记录
+export function exportOmsOrderDeliveryHistory(query) {
+  return request({
+    url: '/oms/orderDeliveryHistory/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/oms/orderItem.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单中所包含的商品列表
+export function listOmsOrderItem(query, pageReq) {
+  return request({
+    url: '/oms/orderItem/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单中所包含的商品详细
+export function getOmsOrderItem(id) {
+  return request({
+    url: '/oms/orderItem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单中所包含的商品
+export function addOmsOrderItem(data) {
+  return request({
+    url: '/oms/orderItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单中所包含的商品
+export function updateOmsOrderItem(data) {
+  return request({
+    url: '/oms/orderItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单中所包含的商品
+export function delOmsOrderItem(id) {
+  return request({
+    url: '/oms/orderItem/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单中所包含的商品
+export function exportOmsOrderItem(query) {
+  return request({
+    url: '/oms/orderItem/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/oms/orderOperateHistory.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单操作历史记录列表
+export function listOmsOrderOperateHistory(query, pageReq) {
+  return request({
+    url: '/oms/orderOperateHistory/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单操作历史记录详细
+export function getOmsOrderOperateHistory(id) {
+  return request({
+    url: '/oms/orderOperateHistory/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单操作历史记录
+export function addOmsOrderOperateHistory(data) {
+  return request({
+    url: '/oms/orderOperateHistory',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单操作历史记录
+export function updateOmsOrderOperateHistory(data) {
+  return request({
+    url: '/oms/orderOperateHistory',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单操作历史记录
+export function delOmsOrderOperateHistory(id) {
+  return request({
+    url: '/oms/orderOperateHistory/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单操作历史记录
+export function exportOmsOrderOperateHistory(query) {
+  return request({
+    url: '/oms/orderOperateHistory/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/oms/refund.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单售后列表
+export function listOmsRefund(query, pageReq) {
+  return request({
+    url: '/oms/refund/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单售后详细
+export function getOmsRefund(id) {
+  return request({
+    url: '/oms/refund/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单售后
+export function addOmsRefund(data) {
+  return request({
+    url: '/oms/refund',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单售后
+export function updateOmsRefund(data) {
+  return request({
+    url: '/oms/refund',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单售后
+export function delOmsRefund(id) {
+  return request({
+    url: '/oms/refund/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单售后
+export function exportOmsRefund(query) {
+  return request({
+    url: '/oms/refund/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/oms/refundItem.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询订单售后列表
+export function listOmsRefundItem(query, pageReq) {
+  return request({
+    url: '/oms/refundItem/list',
+    method: 'post',
+    data: query,
+    params: pageReq
+  })
+}
+
+// 查询订单售后详细
+export function getOmsRefundItem(id) {
+  return request({
+    url: '/oms/refundItem/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单售后
+export function addOmsRefundItem(data) {
+  return request({
+    url: '/oms/refundItem',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单售后
+export function updateOmsRefundItem(data) {
+  return request({
+    url: '/oms/refundItem',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单售后
+export function delOmsRefundItem(id) {
+  return request({
+    url: '/oms/refundItem/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出订单售后
+export function exportOmsRefundItem(query) {
+  return request({
+    url: '/oms/refundItem/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/oms/order/index.vue

@@ -0,0 +1,657 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="MEMBER_ID" prop="memberId">
+        <el-input
+          v-model="queryParams.memberId"
+          placeholder="请输入MEMBER_ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户帐号" prop="memberUsername">
+        <el-input
+          v-model="queryParams.memberUsername"
+          placeholder="请输入用户帐号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单总金额" prop="totalAmount">
+        <el-input
+          v-model="queryParams.totalAmount"
+          placeholder="请输入订单总金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购价" prop="purchasePrice">
+        <el-input
+          v-model="queryParams.purchasePrice"
+          placeholder="请输入采购价"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="应付金额" prop="payAmount">
+        <el-input
+          v-model="queryParams.payAmount"
+          placeholder="请输入应付金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="运费金额" prop="freightAmount">
+        <el-input
+          v-model="queryParams.freightAmount"
+          placeholder="请输入运费金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付方式：0->未支付；1->支付宝；2->微信" prop="payType">
+        <el-select v-model="queryParams.payType" placeholder="请选择支付方式：0->未支付；1->支付宝；2->微信" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <template v-if="showMoreCondition">
+      <el-form-item label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功" prop="refundStatus">
+        <el-select v-model="queryParams.refundStatus" placeholder="请选择退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
+        <el-input
+          v-model="queryParams.deliveryCompany"
+          placeholder="请输入物流公司(配送方式)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物流单号" prop="deliverySn">
+        <el-input
+          v-model="queryParams.deliverySn"
+          placeholder="请输入物流单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="自动确认时间" prop="autoConfirmDay">
+        <el-input
+          v-model="queryParams.autoConfirmDay"
+          placeholder="请输入自动确认时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收货人姓名" prop="receiverName">
+        <el-input
+          v-model="queryParams.receiverName"
+          placeholder="请输入收货人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收货人电话" prop="receiverPhone">
+        <el-input
+          v-model="queryParams.receiverPhone"
+          placeholder="请输入收货人电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收货人邮编" prop="receiverPostCode">
+        <el-input
+          v-model="queryParams.receiverPostCode"
+          placeholder="请输入收货人邮编"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="省份/直辖市" prop="receiverProvince">
+        <el-input
+          v-model="queryParams.receiverProvince"
+          placeholder="请输入省份/直辖市"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="城市" prop="receiverCity">
+        <el-input
+          v-model="queryParams.receiverCity"
+          placeholder="请输入城市"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区" prop="receiverDistrict">
+        <el-input
+          v-model="queryParams.receiverDistrict"
+          placeholder="请输入区"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="省份/直辖市id" prop="receiverProvinceId">
+        <el-input
+          v-model="queryParams.receiverProvinceId"
+          placeholder="请输入省份/直辖市id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="城市id" prop="receiverCityId">
+        <el-input
+          v-model="queryParams.receiverCityId"
+          placeholder="请输入城市id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区id" prop="receiverDistrictId">
+        <el-input
+          v-model="queryParams.receiverDistrictId"
+          placeholder="请输入区id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址" prop="receiverDetailAddress">
+        <el-input
+          v-model="queryParams.receiverDetailAddress"
+          placeholder="请输入详细地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="确认收货状态：0->未确认；1->已确认" prop="confirmStatus">
+        <el-select v-model="queryParams.confirmStatus" placeholder="请选择确认收货状态：0->未确认；1->已确认" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="删除状态：0->未删除；1->已删除" prop="deleteStatus">
+        <el-select v-model="queryParams.deleteStatus" placeholder="请选择删除状态：0->未删除；1->已删除" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="支付时间" prop="paymentTime">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.paymentTime"
+            type="datetime"
+            value-format="yyyy-MM-ddTHH:mm:ss"
+            placeholder="选择支付时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="发货时间" prop="deliveryTime">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.deliveryTime"
+            type="datetime"
+            value-format="yyyy-MM-ddTHH:mm:ss"
+            placeholder="选择发货时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="确认收货时间" prop="receiveTime">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.receiveTime"
+            type="datetime"
+            value-format="yyyy-MM-ddTHH:mm:ss"
+            placeholder="选择确认收货时间">
+        </el-date-picker>
+      </el-form-item>
+    </template>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:order:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsOrderList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
+      <el-table-column label="用户帐号" align="center" prop="memberUsername" />
+      <el-table-column label="订单总金额" align="center" prop="totalAmount" />
+      <el-table-column label="采购价" align="center" prop="purchasePrice" />
+      <el-table-column label="应付金额" align="center" prop="payAmount" />
+      <el-table-column label="运费金额" align="center" prop="freightAmount" />
+      <el-table-column label="支付方式：0->未支付；1->支付宝；2->微信" align="center" prop="payType" />
+      <el-table-column label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" align="center" prop="status" />
+      <el-table-column label="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功" align="center" prop="refundStatus" />
+      <el-table-column label="物流公司(配送方式)" align="center" prop="deliveryCompany" />
+      <el-table-column label="物流单号" align="center" prop="deliverySn" />
+      <el-table-column label="自动确认时间" align="center" prop="autoConfirmDay" />
+      <el-table-column label="收货人姓名" align="center" prop="receiverName" />
+      <el-table-column label="收货人电话" align="center" prop="receiverPhone" />
+      <el-table-column label="收货人邮编" align="center" prop="receiverPostCode" />
+      <el-table-column label="省份/直辖市" align="center" prop="receiverProvince" />
+      <el-table-column label="城市" align="center" prop="receiverCity" />
+      <el-table-column label="区" align="center" prop="receiverDistrict" />
+      <el-table-column label="省份/直辖市id" align="center" prop="receiverProvinceId" />
+      <el-table-column label="城市id" align="center" prop="receiverCityId" />
+      <el-table-column label="区id" align="center" prop="receiverDistrictId" />
+      <el-table-column label="详细地址" align="center" prop="receiverDetailAddress" />
+      <el-table-column label="订单备注" align="center" prop="note" />
+      <el-table-column label="确认收货状态：0->未确认；1->已确认" align="center" prop="confirmStatus" />
+      <el-table-column label="删除状态：0->未删除；1->已删除" align="center" prop="deleteStatus" />
+      <el-table-column label="支付时间" align="center" prop="paymentTime" width="180" >
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.paymentTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="发货时间" align="center" prop="deliveryTime" width="180" >
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.deliveryTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认收货时间" align="center" prop="receiveTime" width="180" >
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.receiveTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:order:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:order:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="MEMBER_ID" prop="memberId">
+          <el-input v-model="form.memberId" placeholder="请输入MEMBER_ID" />
+        </el-form-item>
+        <el-form-item label="用户帐号" prop="memberUsername">
+          <el-input v-model="form.memberUsername" placeholder="请输入用户帐号" />
+        </el-form-item>
+        <el-form-item label="订单总金额" prop="totalAmount">
+          <el-input v-model="form.totalAmount" placeholder="请输入订单总金额" />
+        </el-form-item>
+        <el-form-item label="采购价" prop="purchasePrice">
+          <el-input v-model="form.purchasePrice" placeholder="请输入采购价" />
+        </el-form-item>
+        <el-form-item label="应付金额" prop="payAmount">
+          <el-input v-model="form.payAmount" placeholder="请输入应付金额" />
+        </el-form-item>
+        <el-form-item label="运费金额" prop="freightAmount">
+          <el-input v-model="form.freightAmount" placeholder="请输入运费金额" />
+        </el-form-item>
+        <el-form-item label="支付方式：0->未支付；1->支付宝；2->微信" prop="payType">
+          <el-select v-model="form.payType" placeholder="请选择支付方式：0->未支付；1->支付宝；2->微信">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功">
+          <el-radio-group v-model="form.refundStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
+          <el-input v-model="form.deliveryCompany" placeholder="请输入物流公司(配送方式)" />
+        </el-form-item>
+        <el-form-item label="物流单号" prop="deliverySn">
+          <el-input v-model="form.deliverySn" placeholder="请输入物流单号" />
+        </el-form-item>
+        <el-form-item label="自动确认时间" prop="autoConfirmDay">
+          <el-input v-model="form.autoConfirmDay" placeholder="请输入自动确认时间" />
+        </el-form-item>
+        <el-form-item label="收货人姓名" prop="receiverName">
+          <el-input v-model="form.receiverName" placeholder="请输入收货人姓名" />
+        </el-form-item>
+        <el-form-item label="收货人电话" prop="receiverPhone">
+          <el-input v-model="form.receiverPhone" placeholder="请输入收货人电话" />
+        </el-form-item>
+        <el-form-item label="收货人邮编" prop="receiverPostCode">
+          <el-input v-model="form.receiverPostCode" placeholder="请输入收货人邮编" />
+        </el-form-item>
+        <el-form-item label="省份/直辖市" prop="receiverProvince">
+          <el-input v-model="form.receiverProvince" placeholder="请输入省份/直辖市" />
+        </el-form-item>
+        <el-form-item label="城市" prop="receiverCity">
+          <el-input v-model="form.receiverCity" placeholder="请输入城市" />
+        </el-form-item>
+        <el-form-item label="区" prop="receiverDistrict">
+          <el-input v-model="form.receiverDistrict" placeholder="请输入区" />
+        </el-form-item>
+        <el-form-item label="省份/直辖市id" prop="receiverProvinceId">
+          <el-input v-model="form.receiverProvinceId" placeholder="请输入省份/直辖市id" />
+        </el-form-item>
+        <el-form-item label="城市id" prop="receiverCityId">
+          <el-input v-model="form.receiverCityId" placeholder="请输入城市id" />
+        </el-form-item>
+        <el-form-item label="区id" prop="receiverDistrictId">
+          <el-input v-model="form.receiverDistrictId" placeholder="请输入区id" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="receiverDetailAddress">
+          <el-input v-model="form.receiverDetailAddress" placeholder="请输入详细地址" />
+        </el-form-item>
+        <el-form-item label="订单备注" prop="note">
+          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="确认收货状态：0->未确认；1->已确认">
+          <el-radio-group v-model="form.confirmStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="删除状态：0->未删除；1->已删除">
+          <el-radio-group v-model="form.deleteStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="支付时间" prop="paymentTime">
+          <el-date-picker clearable size="small"
+                        v-model="form.paymentTime"
+                        type="datetime"
+                        value-format="yyyy-MM-ddTHH:mm:ss"
+                        placeholder="选择支付时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="发货时间" prop="deliveryTime">
+          <el-date-picker clearable size="small"
+                        v-model="form.deliveryTime"
+                        type="datetime"
+                        value-format="yyyy-MM-ddTHH:mm:ss"
+                        placeholder="选择发货时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="确认收货时间" prop="receiveTime">
+          <el-date-picker clearable size="small"
+                        v-model="form.receiveTime"
+                        type="datetime"
+                        value-format="yyyy-MM-ddTHH:mm:ss"
+                        placeholder="选择确认收货时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsOrder, getOmsOrder, delOmsOrder, addOmsOrder, updateOmsOrder, exportOmsOrder } from "@/api/oms/order";
+
+export default {
+  name: "OmsOrder",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单表表格数据
+      omsOrderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        memberId: null,
+        memberUsername: null,
+        totalAmount: null,
+        purchasePrice: null,
+        payAmount: null,
+        freightAmount: null,
+        payType: null,
+        status: null,
+        refundStatus: null,
+        deliveryCompany: null,
+        deliverySn: null,
+        autoConfirmDay: null,
+        receiverName: null,
+        receiverPhone: null,
+        receiverPostCode: null,
+        receiverProvince: null,
+        receiverCity: null,
+        receiverDistrict: null,
+        receiverProvinceId: null,
+        receiverCityId: null,
+        receiverDistrictId: null,
+        receiverDetailAddress: null,
+        note: null,
+        confirmStatus: null,
+        deleteStatus: null,
+        paymentTime: null,
+        deliveryTime: null,
+        receiveTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        memberId: [
+          { required: true, message: "MEMBER_ID不能为空", trigger: "blur" }
+        ],
+        receiverName: [
+          { required: true, message: "收货人姓名不能为空", trigger: "blur" }
+        ],
+        receiverPhone: [
+          { required: true, message: "收货人电话不能为空", trigger: "blur" }
+        ],
+      },
+      showMoreCondition: false
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单表列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsOrder(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsOrderList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        memberId: null,
+        memberUsername: null,
+        totalAmount: null,
+        purchasePrice: null,
+        payAmount: null,
+        freightAmount: null,
+        payType: null,
+        status: 0,
+        refundStatus: 0,
+        deliveryCompany: null,
+        deliverySn: null,
+        autoConfirmDay: null,
+        receiverName: null,
+        receiverPhone: null,
+        receiverPostCode: null,
+        receiverProvince: null,
+        receiverCity: null,
+        receiverDistrict: null,
+        receiverProvinceId: null,
+        receiverCityId: null,
+        receiverDistrictId: null,
+        receiverDetailAddress: null,
+        note: null,
+        confirmStatus: 0,
+        deleteStatus: 0,
+        paymentTime: null,
+        deliveryTime: null,
+        receiveTime: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsOrder(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsOrder(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsOrder(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单表编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsOrder(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单表数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsOrder(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/oms/orderDeliveryHistory/index.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="订单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
+        <el-input
+          v-model="queryParams.deliveryCompany"
+          placeholder="请输入物流公司(配送方式)"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物流单号" prop="deliverySn">
+        <el-input
+          v-model="queryParams.deliverySn"
+          placeholder="请输入物流单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:orderDeliveryHistory:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsOrderDeliveryHistoryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="物流公司(配送方式)" align="center" prop="deliveryCompany" />
+      <el-table-column label="物流单号" align="center" prop="deliverySn" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:orderDeliveryHistory:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:orderDeliveryHistory:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单发货记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item>
+        <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
+          <el-input v-model="form.deliveryCompany" placeholder="请输入物流公司(配送方式)" />
+        </el-form-item>
+        <el-form-item label="物流单号" prop="deliverySn">
+          <el-input v-model="form.deliverySn" placeholder="请输入物流单号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsOrderDeliveryHistory, getOmsOrderDeliveryHistory, delOmsOrderDeliveryHistory, addOmsOrderDeliveryHistory, updateOmsOrderDeliveryHistory, exportOmsOrderDeliveryHistory } from "@/api/oms/orderDeliveryHistory";
+
+export default {
+  name: "OmsOrderDeliveryHistory",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单发货记录表格数据
+      omsOrderDeliveryHistoryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        deliveryCompany: null,
+        deliverySn: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单发货记录列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsOrderDeliveryHistory(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsOrderDeliveryHistoryList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderId: null,
+        deliveryCompany: null,
+        deliverySn: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单发货记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsOrderDeliveryHistory(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单发货记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsOrderDeliveryHistory(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsOrderDeliveryHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单发货记录编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsOrderDeliveryHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单发货记录数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsOrderDeliveryHistory(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/oms/orderItem/index.vue

@@ -0,0 +1,424 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="订单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="PRODUCT_ID" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入PRODUCT_ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品编码" prop="outProductId">
+        <el-input
+          v-model="queryParams.outProductId"
+          placeholder="请输入商品编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品sku id" prop="skuId">
+        <el-input
+          v-model="queryParams.skuId"
+          placeholder="请输入商品sku id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="sku编码" prop="outSkuId">
+        <el-input
+          v-model="queryParams.outSkuId"
+          placeholder="请输入sku编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品快照id" prop="productSnapshotId">
+        <el-input
+          v-model="queryParams.productSnapshotId"
+          placeholder="请输入商品快照id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="sku快照id" prop="skuSnapshotId">
+        <el-input
+          v-model="queryParams.skuSnapshotId"
+          placeholder="请输入sku快照id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <template v-if="showMoreCondition">
+      <el-form-item label="展示图片" prop="pic">
+        <el-input
+          v-model="queryParams.pic"
+          placeholder="请输入展示图片"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="PRODUCT_NAME" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入PRODUCT_NAME"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售价格" prop="salePrice">
+        <el-input
+          v-model="queryParams.salePrice"
+          placeholder="请输入销售价格"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购价" prop="purchasePrice">
+        <el-input
+          v-model="queryParams.purchasePrice"
+          placeholder="请输入采购价"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="购买数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入购买数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商品分类id" prop="productCategoryId">
+        <el-input
+          v-model="queryParams.productCategoryId"
+          placeholder="请输入商品分类id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </template>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:orderItem:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsOrderItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="PRODUCT_ID" align="center" prop="productId" />
+      <el-table-column label="商品编码" align="center" prop="outProductId" />
+      <el-table-column label="商品sku id" align="center" prop="skuId" />
+      <el-table-column label="sku编码" align="center" prop="outSkuId" />
+      <el-table-column label="商品快照id" align="center" prop="productSnapshotId" />
+      <el-table-column label="sku快照id" align="center" prop="skuSnapshotId" />
+      <el-table-column label="展示图片" align="center" prop="pic" />
+      <el-table-column label="PRODUCT_NAME" align="center" prop="productName" />
+      <el-table-column label="销售价格" align="center" prop="salePrice" />
+      <el-table-column label="采购价" align="center" prop="purchasePrice" />
+      <el-table-column label="购买数量" align="center" prop="quantity" />
+      <el-table-column label="商品分类id" align="center" prop="productCategoryId" />
+      <el-table-column label="商品sku属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]" align="center" prop="spData" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:orderItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:orderItem:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单中所包含的商品对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item>
+        <el-form-item label="PRODUCT_ID" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入PRODUCT_ID" />
+        </el-form-item>
+        <el-form-item label="商品编码" prop="outProductId">
+          <el-input v-model="form.outProductId" placeholder="请输入商品编码" />
+        </el-form-item>
+        <el-form-item label="商品sku id" prop="skuId">
+          <el-input v-model="form.skuId" placeholder="请输入商品sku id" />
+        </el-form-item>
+        <el-form-item label="sku编码" prop="outSkuId">
+          <el-input v-model="form.outSkuId" placeholder="请输入sku编码" />
+        </el-form-item>
+        <el-form-item label="商品快照id" prop="productSnapshotId">
+          <el-input v-model="form.productSnapshotId" placeholder="请输入商品快照id" />
+        </el-form-item>
+        <el-form-item label="sku快照id" prop="skuSnapshotId">
+          <el-input v-model="form.skuSnapshotId" placeholder="请输入sku快照id" />
+        </el-form-item>
+        <el-form-item label="展示图片" prop="pic">
+          <el-input v-model="form.pic" placeholder="请输入展示图片" />
+        </el-form-item>
+        <el-form-item label="PRODUCT_NAME" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入PRODUCT_NAME" />
+        </el-form-item>
+        <el-form-item label="销售价格" prop="salePrice">
+          <el-input v-model="form.salePrice" placeholder="请输入销售价格" />
+        </el-form-item>
+        <el-form-item label="采购价" prop="purchasePrice">
+          <el-input v-model="form.purchasePrice" placeholder="请输入采购价" />
+        </el-form-item>
+        <el-form-item label="购买数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入购买数量" />
+        </el-form-item>
+        <el-form-item label="商品分类id" prop="productCategoryId">
+          <el-input v-model="form.productCategoryId" placeholder="请输入商品分类id" />
+        </el-form-item>
+        <el-form-item label="商品sku属性:[{"key":"颜色","value":"颜色"},{"key":"容量","value":"4G"}]" prop="spData">
+          <el-input v-model="form.spData" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsOrderItem, getOmsOrderItem, delOmsOrderItem, addOmsOrderItem, updateOmsOrderItem, exportOmsOrderItem } from "@/api/oms/orderItem";
+
+export default {
+  name: "OmsOrderItem",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单中所包含的商品表格数据
+      omsOrderItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        productId: null,
+        outProductId: null,
+        skuId: null,
+        outSkuId: null,
+        productSnapshotId: null,
+        skuSnapshotId: null,
+        pic: null,
+        productName: null,
+        salePrice: null,
+        purchasePrice: null,
+        quantity: null,
+        productCategoryId: null,
+        spData: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        outProductId: [
+          { required: true, message: "商品编码不能为空", trigger: "blur" }
+        ],
+        outSkuId: [
+          { required: true, message: "sku编码不能为空", trigger: "blur" }
+        ],
+      },
+      showMoreCondition: false
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单中所包含的商品列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsOrderItem(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsOrderItemList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderId: null,
+        productId: null,
+        outProductId: null,
+        skuId: null,
+        outSkuId: null,
+        productSnapshotId: null,
+        skuSnapshotId: null,
+        pic: null,
+        productName: null,
+        salePrice: null,
+        purchasePrice: null,
+        quantity: null,
+        productCategoryId: null,
+        spData: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单中所包含的商品";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsOrderItem(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单中所包含的商品";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsOrderItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsOrderItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单中所包含的商品编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsOrderItem(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单中所包含的商品数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsOrderItem(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/oms/orderOperateHistory/index.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="订单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="操作人：用户；系统；后台管理员" prop="operateMan">
+        <el-input
+          v-model="queryParams.operateMan"
+          placeholder="请输入操作人：用户；系统；后台管理员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" prop="orderStatus">
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:orderOperateHistory:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="操作人：用户；系统；后台管理员" align="center" prop="operateMan" />
+      <el-table-column label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单" align="center" prop="orderStatus" />
+      <el-table-column label="备注" align="center" prop="note" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:orderOperateHistory:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:orderOperateHistory:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单操作历史记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item>
+        <el-form-item label="操作人：用户；系统；后台管理员" prop="operateMan">
+          <el-input v-model="form.operateMan" placeholder="请输入操作人：用户；系统；后台管理员" />
+        </el-form-item>
+        <el-form-item label="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单">
+          <el-radio-group v-model="form.orderStatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="note">
+          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsOrderOperateHistory, getOmsOrderOperateHistory, delOmsOrderOperateHistory, addOmsOrderOperateHistory, updateOmsOrderOperateHistory, exportOmsOrderOperateHistory } from "@/api/oms/orderOperateHistory";
+
+export default {
+  name: "OmsOrderOperateHistory",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单操作历史记录表格数据
+      omsOrderOperateHistoryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        operateMan: null,
+        orderStatus: null,
+        note: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单操作历史记录列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsOrderOperateHistory(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsOrderOperateHistoryList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderId: null,
+        operateMan: null,
+        orderStatus: 0,
+        note: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单操作历史记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsOrderOperateHistory(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单操作历史记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsOrderOperateHistory(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsOrderOperateHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单操作历史记录编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsOrderOperateHistory(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单操作历史记录数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsOrderOperateHistory(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/oms/refund/index.vue

@@ -0,0 +1,379 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="MEMBER_ID" prop="memberId">
+        <el-input
+          v-model="queryParams.memberId"
+          placeholder="请输入MEMBER_ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="退款金额" prop="returnAmount">
+        <el-input
+          v-model="queryParams.returnAmount"
+          placeholder="请输入退款金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="售后类型：1：退款，2：退货退款" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择售后类型：1：退款，2：退货退款" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" clearable size="small">
+              <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理时间" prop="handleTime">
+        <el-date-picker
+            clearable
+            size="small"
+            v-model="queryParams.handleTime"
+            type="datetime"
+            value-format="yyyy-MM-ddTHH:mm:ss"
+            placeholder="选择处理时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="退货数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入退货数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <template v-if="showMoreCondition">
+      <el-form-item label="原因" prop="reason">
+        <el-input
+          v-model="queryParams.reason"
+          placeholder="请输入原因"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理人员" prop="handleMan">
+        <el-input
+          v-model="queryParams.handleMan"
+          placeholder="请输入处理人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+    </template>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:refund:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsRefundList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
+      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="退款金额" align="center" prop="returnAmount" />
+      <el-table-column label="售后类型：1：退款，2：退货退款" align="center" prop="type" />
+      <el-table-column label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝" align="center" prop="status" />
+      <el-table-column label="处理时间" align="center" prop="handleTime" width="180" >
+        <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.handleTime, '')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="退货数量" align="center" prop="quantity" />
+      <el-table-column label="原因" align="center" prop="reason" />
+      <el-table-column label="描述" align="center" prop="description" />
+      <el-table-column label="凭证图片，以逗号隔开" align="center" prop="proofPics" />
+      <el-table-column label="处理备注" align="center" prop="handleNote" />
+      <el-table-column label="处理人员" align="center" prop="handleMan" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:refund:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:refund:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单售后对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="MEMBER_ID" prop="memberId">
+          <el-input v-model="form.memberId" placeholder="请输入MEMBER_ID" />
+        </el-form-item>
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item>
+        <el-form-item label="退款金额" prop="returnAmount">
+          <el-input v-model="form.returnAmount" placeholder="请输入退款金额" />
+        </el-form-item>
+        <el-form-item label="售后类型：1：退款，2：退货退款" prop="type">
+          <el-select v-model="form.type" placeholder="请选择售后类型：1：退款，2：退货退款">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="处理时间" prop="handleTime">
+          <el-date-picker clearable size="small"
+                        v-model="form.handleTime"
+                        type="datetime"
+                        value-format="yyyy-MM-ddTHH:mm:ss"
+                        placeholder="选择处理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="退货数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入退货数量" />
+        </el-form-item>
+        <el-form-item label="原因" prop="reason">
+          <el-input v-model="form.reason" placeholder="请输入原因" />
+        </el-form-item>
+        <el-form-item label="描述" prop="description">
+          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="凭证图片，以逗号隔开" prop="proofPics">
+          <el-input v-model="form.proofPics" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="处理备注" prop="handleNote">
+          <el-input v-model="form.handleNote" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="处理人员" prop="handleMan">
+          <el-input v-model="form.handleMan" placeholder="请输入处理人员" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsRefund, getOmsRefund, delOmsRefund, addOmsRefund, updateOmsRefund, exportOmsRefund } from "@/api/oms/refund";
+
+export default {
+  name: "OmsRefund",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单售后表格数据
+      omsRefundList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        memberId: null,
+        orderId: null,
+        returnAmount: null,
+        type: null,
+        status: null,
+        handleTime: null,
+        quantity: null,
+        reason: null,
+        description: null,
+        proofPics: null,
+        handleNote: null,
+        handleMan: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        memberId: [
+          { required: true, message: "MEMBER_ID不能为空", trigger: "blur" }
+        ],
+      },
+      showMoreCondition: false
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单售后列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsRefund(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsRefundList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        memberId: null,
+        orderId: null,
+        returnAmount: null,
+        type: null,
+        status: 0,
+        handleTime: null,
+        quantity: null,
+        reason: null,
+        description: null,
+        proofPics: null,
+        handleNote: null,
+        handleMan: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单售后";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsRefund(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单售后";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsRefund(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsRefund(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单售后编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsRefund(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单售后数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsRefund(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/oms/refundItem/index.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="MEMBER_ID" prop="memberId">
+        <el-input
+          v-model="queryParams.memberId"
+          placeholder="请输入MEMBER_ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="订单id" prop="orderId">
+        <el-input
+          v-model="queryParams.orderId"
+          placeholder="请输入订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子订单id" prop="orderItemId">
+        <el-input
+          v-model="queryParams.orderItemId"
+          placeholder="请输入子订单id"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="退款金额" prop="returnAmount">
+        <el-input
+          v-model="queryParams.returnAmount"
+          placeholder="请输入退款金额"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="退货数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入退货数量"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oms:refundItem:add']"
+        >新增</el-button>
+      </el-col>
+      </el-col>
+    </el-row>
+
+    <el-table v-loading="loading" :data="omsRefundItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
+      <el-table-column label="订单id" align="center" prop="orderId" />
+      <el-table-column label="子订单id" align="center" prop="orderItemId" />
+      <el-table-column label="退款金额" align="center" prop="returnAmount" />
+      <el-table-column label="退货数量" align="center" prop="quantity" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oms:refundItem:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oms:refundItem:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改订单售后对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
+        <el-form-item label="MEMBER_ID" prop="memberId">
+          <el-input v-model="form.memberId" placeholder="请输入MEMBER_ID" />
+        </el-form-item>
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item>
+        <el-form-item label="子订单id" prop="orderItemId">
+          <el-input v-model="form.orderItemId" placeholder="请输入子订单id" />
+        </el-form-item>
+        <el-form-item label="退款金额" prop="returnAmount">
+          <el-input v-model="form.returnAmount" placeholder="请输入退款金额" />
+        </el-form-item>
+        <el-form-item label="退货数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入退货数量" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listOmsRefundItem, getOmsRefundItem, delOmsRefundItem, addOmsRefundItem, updateOmsRefundItem, exportOmsRefundItem } from "@/api/oms/refundItem";
+
+export default {
+  name: "OmsRefundItem",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 订单售后表格数据
+      omsRefundItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        memberId: null,
+        orderId: null,
+        orderItemId: null,
+        returnAmount: null,
+        quantity: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        memberId: [
+          { required: true, message: "MEMBER_ID不能为空", trigger: "blur" }
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询订单售后列表 */
+    getList() {
+      this.loading = true;
+      const {pageNum, pageSize} = this.queryParams;
+      const query = {...this.queryParams, pageNum: undefined, pageSize: undefined};
+      const pageReq = {page: pageNum - 1, size: pageSize};
+      listOmsRefundItem(query, pageReq).then(response => {
+        const { content, totalElements } = response
+        this.omsRefundItemList = content;
+        this.total = totalElements;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        memberId: null,
+        orderId: null,
+        orderItemId: null,
+        returnAmount: null,
+        quantity: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加订单售后";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOmsRefundItem(id).then(response => {
+        this.form = response;
+        this.open = true;
+        this.title = "修改订单售后";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateOmsRefundItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOmsRefundItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除订单售后编号为"' + ids + '"的数据项？').then(function() {
+        return delOmsRefundItem(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有订单售后数据项？').then(() => {
+        this.exportLoading = true;
+        return exportOmsRefundItem(queryParams);
+      }).then(response => {
+        this.$download.download(response);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>