Merge remote-tracking branch 'origin/dev' into dev

src/api/tirePartsMall/salesService/outboundTask.js

@@ -0,0 +1,58 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/ship/list',
+    method: 'get',
+    params: params
+  })
+}
+//删除
+export const remove = (id) => {
+  return request({
+    url: '/api/blade-sales-part/ship/update',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
+//派工
+export const outboundWorkOrder = (ids) => {
+  return request({
+    url: '/api/blade-sales-part/ship/outboundWorkOrder',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+//修改
+export const typeSave = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/edit',
+    method: 'post',
+    data: data
+  })
+}
+//入库任务派工
+export const generateWarehousing = (ids) => {
+  return request({
+    url: '/api/blade-sales-part/ship/generateWarehousing',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+// 撤销派工
+export const shipRevokeWorkOrder = (ids) => {
+  return request({
+    url: '/api/blade-sales-part/ship/revokeWorkOrder',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}

src/api/tirePartsMall/salesService/outboundWorkOrder.js

@@ -0,0 +1,108 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/ship/list',
+    method: 'get',
+    params: params
+  })
+}
+//删除
+export const remove = (id) => {
+  return request({
+    url: '/api/blade-sales-part/ship/update',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
+export const tradingBox = (id) => {
+  return request({
+    url: '/api/blade-sales-part/shipItems/update',
+    method: 'post',
+    data: {
+      id
+    }
+  })
+}
+export const getDetails = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/detail',
+    method: 'get',
+    params: data
+  })
+}
+export const submit = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/submit',
+    method: 'POST',
+    data: data
+  })
+}
+
+export const shipments = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/logistics',
+    method: 'PUT',
+    data: data
+  })
+}
+
+export const warehousingComplete = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/outboundCompleted',
+    method: 'POST',
+    data: data
+  })
+}
+//撤销出库
+export const revokeOutboundCompleted = (data) => {
+  return request({
+    url: '/api/blade-sales-part/ship/revokeOutboundCompleted',
+    method: 'POST',
+    data: data
+  })
+}
+//商品类别列表查询
+export const getGoodsInfo = (query) => {
+  return request({
+    url: ' /api/blade-purchase-sales/orderitems/orderItemsList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 调拨列表
+export const transferAllocateList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/transferAllocate/list',
+    method: 'get',
+    params: params
+  })
+}
+// 调拨保存
+export const transferAllocateSubmit = (data) => {
+  return request({
+    url: '/api/blade-sales-part/transferAllocate/submit',
+    method: 'POST',
+    data: data
+  })
+}
+// 确认调拨
+export const confirmTransferAllocate = (data) => {
+  return request({
+    url: '/api/blade-sales-part/transferAllocate/confirmTransferAllocate',
+    method: 'POST',
+    data: data
+  })
+}
+// 撤销调拨
+export const revokeTransferAllocate = (data) => {
+  return request({
+    url: '/api/blade-sales-part/transferAllocate/revokeTransferAllocate',
+    method: 'POST',
+    data: data
+  })
+}
+

src/api/tirePartsMall/salesService/saleOrder.js

@@ -0,0 +1,240 @@
+import request from '@/router/axios';
+//查询列表*
+export const getList = (params) => {
+  return request({
+    url: '/api/blade-los/returns/list',
+    method: 'get',
+    params: params
+  })
+}
+//删除*
+export const remove = (data) => {
+  return request({
+    url: '/api/blade-los/returns/remove',
+    method: 'post',
+    data
+  })
+}
+//*
+export const getDetails = (data) => {
+  return request({
+    url: '/api/blade-los/returns/detail',
+    method: 'get',
+    params: data
+  })
+}
+//*
+export const submit = (data) => {
+  return request({
+    url: '/api/blade-los/returns/submit',
+    method: 'POST',
+    data: data
+  })
+}
+// *
+export const generateShipTask = (data) => {
+  return request({
+    url: '/api/blade-los/returns/generateShipTaskReturns',
+    method: 'post',
+    data: data
+  })
+}
+// *
+export const revokeGenerateShipTask = (data) => {
+  return request({
+    url: '/api/blade-los/returns/revokeGenerateShipTaskReturns',
+    method: 'post',
+    data: data
+  })
+}
+
+export const tradingBox = (data) => {
+  return request({
+    url: '/api/blade-sales-part/shipItems/update',
+    method: 'post',
+    data: data
+  })
+}
+export const delOrderItem = (data) => {
+  return request({
+    url: '/api/blade-sales-part/orderItems/remove',
+    method: 'get',
+    params: data
+  })
+}
+//申请退款
+export const checkOrder = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/checkOrder',
+    method: 'post',
+    data: data
+  })
+}
+//确认退款*
+export const confirmRefund = (data) => {
+  return request({
+    url: '/api/blade-los/returns/checkOrderReturns',
+    method: 'post',
+    data: data
+  })
+}
+//撤销请核*
+export const revokeCheckOrder = (data) => {
+  return request({
+    url: '/api/blade-los/returns/revokeCheckOrderReturns',
+    method: 'post',
+    data: data
+  })
+}
+
+export const goodsListXs = (customId,stock) => {
+  return request({
+    url: '/api/blade-sales-part/goodsDesc/goodsListXs',
+    method: 'get',
+    params:{
+      customId,
+      stock
+    }
+  })
+}
+// 销售订单添加轮胎列表
+export const goodsPageXs = (params) => {
+  return request({
+    url: '/api/blade-sales-part/goodsDesc/goodsPageXs',
+    method: 'get',
+    params:params
+  })
+}
+
+//采购订单保存
+export const inboundTask = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/inboundTask',
+    method: 'POST',
+    data: data
+  })
+}
+//请核
+export const checkOrderCG = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/checkOrderCG',
+    method: 'post',
+    data: data
+  })
+}
+//采购订单撤销请核
+export const revokeCheckOrderCG = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/revokeCheckOrderCG',
+    method: 'post',
+    data: data
+  })
+}
+//采购订单撤销任务
+export const revokeInboundTask = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/revokeInboundTask',
+    method: 'post',
+    data: data
+  })
+}
+//商品类别列表查询
+export const getGoodsInfo = (query) => {
+  return request({
+    url: ' /api/blade-purchase-sales/orderitems/orderItemsList',
+    method: 'get',
+    params: query
+  })
+}
+
+//查询轮胎列表
+export const goodsListAll = () => {
+  return request({
+    url: 'api/blade-sales-part/goodsDesc/goodsListAll?enableOrNot=1',
+    method: 'get',
+  })
+}
+///
+//查询客户
+export const getKh = () => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
+    method: 'get',
+  })
+}
+// 收款结算里的查询客户
+export const skgetKh = () => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll?cname=&corpType=KH&enableOrNot=1',
+    method: 'get',
+  })
+}
+// 采购入库里的业务对象
+export const corpsDescListAll = (data) => {
+  return request({
+    url: '/api/blade-sales-part/corpsDesc/listAll',
+    method: 'get',
+    params:data
+  })
+}
+//收款账户下拉
+export const getSk = () => {
+  return request({
+    url: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&billType=HYCK',
+    method: 'get',
+  })
+}
+//所属公司下拉
+export const topList = () => {
+  return request({
+    url: '/api/blade-system/dept/top-list',
+    method: 'get'
+  })
+}
+//制单人下拉
+export const getZd = () => {
+  return request({
+    url: '/api/blade-user/page?size=20&current=1',
+    method: 'get'
+  })
+}
+// 调拨添加轮胎列表
+export const goodsPageDB = (params) => {
+  return request({
+    url: '/api/blade-sales-part/goodsDesc/goodsPageDB',
+    method: 'get',
+    params:params
+  })
+}
+// 一件入库
+export const shortcutWarehousing = (data) => {
+  return request({
+    url: '/api/blade-sales-part/order/shortcutWarehousing',
+    method: 'post',
+    data: data
+  })
+}
+// 盘点列表
+export const inventoryList = (params) => {
+  return request({
+    url: '/api/blade-sales-part/inventory/list',
+    method: 'get',
+    params: params
+  })
+}
+// 盘点保存
+export const submitInventory = (data) => {
+  return request({
+    url: '/api/blade-sales-part/inventory/submitInventory',
+    method: 'POST',
+    data: data
+  })
+}
+// 盘点保存
+export const confirmInventory = (data) => {
+  return request({
+    url: '/api/blade-sales-part/inventory/confirmInventory',
+    method: 'POST',
+    data: data
+  })
+}

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -76,7 +76,7 @@
             </trade-card>
             <trade-card title="明细信息">
                 <el-tabs v-model="activeName" type="card">
-                    <el-tab-pane label="销售明细" name="sale_detail">
+                    <el-tab-pane label="退货明细" name="sale_detail">
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
                             :data="form.orderItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
@@ -162,7 +162,7 @@
                             </template>
                         </avue-crud>
                     </el-tab-pane>
-                    <el-tab-pane label="支付明细" name="payment_details">
+                    <el-tab-pane label="交易记录" name="payment_details">
                         <avue-crud :option="optionPaymentDetails" v-model="formContacts" ref="payment_details"
                             :data="dataList" @row-save="rowSave" @row-update="rowUpdate"
                             @resetColumn="resetColumnTwo('payment_details', 'optionPaymentDetails', 'optionPaymentDetailsBack', 269.2)"
@@ -178,7 +178,7 @@
                             </template> -->
                         </avue-crud>
                     </el-tab-pane>
-                    <el-tab-pane label="出库记录" name="outbound_records">
+                    <el-tab-pane label="历史记录" name="outbound_records">
                         <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
                             :data="form.outboundRecordsList" @row-save="rowSave" @row-update="rowUpdate"
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
@@ -298,7 +298,7 @@ import {
     revokeCheckOrder,
     goodsListXs,
     revokeGenerateShipTask, goodsPageXs
-} from "@/api/tirePartsMall/salesManagement/saleOrder";
+} from "@/api/tirePartsMall/salesService/saleOrder";
 import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
 import { dateFormat } from "@/util/date";

src/views/tirePartsMall/salesService/returns/index.vue

@@ -56,9 +56,9 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesService/saleOrder";
 import detailsPage from "./detailsPage"
-import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getDetails } from "@/api/tirePartsMall/salesService/saleOrder";
 import {getToken} from "@/util/auth";
 
 export default {