linwenxin 8 ay önce
ebeveyn
işleme
99274819b1

+ 0 - 28
src/api/material-system/shop/goods-price.js

@@ -1,28 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 获取网点辅材列表
-export function getShopGoodsList(params) {
-  return request({
-    url: '/shop/goods/list',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewShopGoodsList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/goods/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewShopGoodsList(data, name) {
-  return postBlob({
-    url: '/shop/goods/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 118
src/api/material-system/shop/inventory-sheet.js

@@ -1,118 +0,0 @@
-import request ,{postBlob}from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/stock/inventory/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/stock/inventory/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/stock/inventory/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/stock/inventory/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/stock/inventory/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 74
src/api/material-system/shop/lost-sheet.js

@@ -1,74 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 获取网点损溢单列表
-export function getLostSheetList(params) {
-  return request({
-    url: '/shop/lost/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点损溢单信息
-export function getLostSheet(params) {
-  return request({
-    url: '/shop/lost/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 新增网点损溢单
-export function addLostSheet(params) {
-  return request({
-    url: '/shop/lost/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑网点损溢单
-export function editLostSheet(params) {
-  return request({
-    url: '/shop/lost/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 删除网点损溢单
-export function delLostSheet(params) {
-  return request({
-    url: '/shop/lost/del',
-    method: 'post',
-    params
-  })
-}
-
-// 审核网点损溢单
-export function confirmLostSheet(params) {
-  return request({
-    url: '/shop/lost/confirm',
-    method: 'post',
-    params
-  })
-}
-
-
-export function getNewLostSheetList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/lost/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewGetLostSheetList(data, name) {
-  return postBlob({
-    url: '/shop/lost/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 128
src/api/material-system/shop/other-in-sheet.js

@@ -1,128 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/stock/other-in/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/stock/other-in/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/stock/other-in/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 商品列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 部门列表
-export function getDeptList(params) {
-  return request({
-    url: '/k3/dept/list',
-    method: 'get',
-    params
-  })
-}
-
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/stock/other-in/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/stock/other-in/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 136
src/api/material-system/shop/other-out-sheet.js

@@ -1,136 +0,0 @@
-import request ,{postBlob}from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审其他出库单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 查询其他出库单
-export function queryOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/query',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/stock/other-out/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/stock/other-out/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/stock/other-out/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 商品列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 部门列表
-export function getDeptList(params) {
-  return request({
-    url: '/k3/dept/list',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/stock/other-out/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/stock/other-out/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 45
src/api/material-system/shop/pay-manage.js

@@ -1,45 +0,0 @@
-import request, { postBlob } from "@/utils/request";
-
-// 获取支付记录列表
-export function getPayRecordList(params) {
-  return request({
-    url: "/pay/manage/list",
-    method: "get",
-    params
-  });
-}
-
-// 退款
-export function refund(params) {
-  return request({
-    url: "/pay/manage/refund",
-    method: "post",
-    data: params
-  });
-}
-
-export function getNewPayRecordList(data) {
-  return request({
-    url: `/pay/manage/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewPayRecordList(data, name) {
-  return postBlob({
-    url: "/pay/manage/zfire/list/export",
-    data,
-    name
-  });
-}
-
-// 刷新重查一次支付记录
-export function refreshQueryPayRecord(params) {
-  return request({
-    url: "/pay/manage/refresh-query",
-    method: "get",
-    params
-  });
-}

+ 0 - 118
src/api/material-system/shop/price-in-stock-sheet.js

@@ -1,118 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 查询网点采购单
-export function queryOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/query',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/purchase-in-stock/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/purchase-in-stock/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/purchase-in-stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/purchase-in-stock/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/purchase-in-stock/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 117
src/api/material-system/shop/price-ret-sheet.js

@@ -1,117 +0,0 @@
-import request ,{postBlob} from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/unAudit',
-    method: 'post',
-    params
-  })
-}
-// 撤消采购退货单
-export function cancelOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/cancel',
-    method: 'post',
-    params
-  })
-}
-
-// 查询采购退货单
-export function queryOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/query',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/purchase/ret/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/purchase/ret/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/purchase/ret/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/purchase/ret/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/purchase/ret/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 91
src/api/material-system/shop/price-upd-sheet.js

@@ -1,91 +0,0 @@
-import request,{postBlob}  from '@/utils/request'
-
-// 获取网点资料列表
-export function getList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点调售单列表
-export function getPriceUpdSheetList(params) {
-  return request({
-    url: '/shop/price-upd/list',
-    method: 'get',
-    params
-  })
-}
-
-// 新增网点调售单
-export function addPriceUpdSheet(params) {
-  return request({
-    url: '/shop/price-upd/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑网点调售单
-export function editPriceUpdSheet(params) {
-  return request({
-    url: '/shop/price-upd/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 删除网点调售单
-export function delPriceUpdSheet(params) {
-  return request({
-    url: '/shop/price-upd/del',
-    method: 'post',
-    params
-  })
-}
-
-// 审核网点调售单
-export function confirmPriceUpdSheet(params) {
-  return request({
-    url: '/shop/price-upd/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 获取网点调售单信息
-export function getPriceUpdSheet(params) {
-  return request({
-    url: '/shop/price-upd/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 获取分类列表
-export function getCategoryList(params) {
-  return request({
-    url: '/sys/category/list',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewPriceUpdSheetList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/price-upd/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewPriceUpdSheetList(data, name) {
-  return postBlob({
-    url: '/shop/price-upd/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 91
src/api/material-system/shop/purchase-adjustment-sheet.js

@@ -1,91 +0,0 @@
-import request,{postBlob}  from '@/utils/request'
-
-// 新增采购调整单
-export function purchaseAdjustmentSheetAdd(params) {
-  return request({
-    url: '/shop/purchase-adjustment/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 采购调整单审核
-export function purchaseAdjustmentSheetConfirm(params) {
-  return request({
-    url: '/shop/purchase-adjustment/confirm',
-    method: 'get',
-    params
-  })
-}
-
-// 采购调整单提交
-export function purchaseAdjustmentSheetSubmit(params) {
-  return request({
-    url: '/shop/purchase-adjustment/submit',
-    method: 'get',
-    params
-  })
-}
-
-// 采购调整单撤消
-export function purchaseAdjustmentSheetRevoke(params) {
-  return request({
-    url: '/shop/purchase-adjustment/revoke',
-    method: 'get',
-    params
-  })
-}
-
-// 删除采购调整单
-export function purchaseAdjustmentSheetDel(params) {
-  return request({
-    url: '/shop/purchase-adjustment/del',
-    method: 'get',
-    params
-  })
-}
-
-// 编辑采购调整单
-export function purchaseAdjustmentSheetEdit(params) {
-  return request({
-    url: '/shop/purchase-adjustment/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取采购调整单信息
-export function purchaseAdjustmentSheetDetail(params) {
-  return request({
-    url: '/shop/purchase-adjustment/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 获取采购调整单列表
-export function purchaseAdjustmentSheetList(params) {
-  return request({
-    url: '/shop/purchase-adjustment/list',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewPurchaseAdjustmentSheetList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/purchase-adjustment/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewPurchaseAdjustmentSheetList(data, name) {
-  return postBlob({
-    url: '/shop/purchase-adjustment/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 146
src/api/material-system/shop/sale-out-stock-sheet.js

@@ -1,146 +0,0 @@
-import request ,{postBlob}from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 下推销售退货单
-export function pushShopSaleRetSheet(params) {
-  return request({
-    url: '/shop/sale-out-stock/push',
-    method: 'post',
-    params
-  })
-}
-
-// 查询销售退货单
-export function queryOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/query',
-    method: 'post',
-    params
-  })
-}
-
-// 查询销售退货单
-export function queryRetOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/query-ret',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/sale-out-stock/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/sale-out-stock/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/sale-out-stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 商品列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/sale-out-stock/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/sale-out-stock/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 127
src/api/material-system/shop/sale-ret-sheet.js

@@ -1,127 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 新增网点采购单
-export function addOrder(params) {
-  return request({
-    url: '/shop/sale-ret/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核网点采购单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/sale-ret/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点采购单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/sale-ret/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点采购单
-export function delOrder(params) {
-  return request({
-    url: '/shop/sale-ret/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑网点采购单
-export function editOrder(params) {
-  return request({
-    url: '/shop/sale-ret/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点采购单信息
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/sale-ret/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 复制网点采购单
-export function copyOrder(params) {
-  return request({
-    url: '/shop/sale-ret/copy',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/sale-ret/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 商品列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点采购单信息
-export function getShopOrderDetail(params) {
-  return request({
-    url: '/shop/sale/detail',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/sale-ret/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/sale-ret/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 165
src/api/material-system/shop/sale-sheet.js

@@ -1,165 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 新增网点销售单
-export function addSaleSheet(params) {
-  return request({
-    url: '/shop/sale/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑网点销售单
-export function editSaleSheet(params) {
-  return request({
-    url: '/shop/sale/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取网点销售单信息
-export function getSaleSheet(params) {
-  return request({
-    url: '/shop/sale/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点销售单列表
-export function getSaleSheetList(params) {
-  return request({
-    url: '/shop/sale/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点辅材列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/goods/list',
-    method: 'get',
-    params
-  })
-}
-
-// 审核网点销售单
-export function confirmSaleSheet(params) {
-  return request({
-    url: '/shop/sale/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审网点销售单
-export function unAuditSaleSheet(params) {
-  return request({
-    url: '/shop/sale/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 下推网点销售单
-export function pushSaleSheet(params) {
-  return request({
-    url: '/shop/sale/push',
-    method: 'post',
-    params
-  })
-}
-
-// 删除网点销售单
-export function delSaleSheet(params) {
-  return request({
-    url: '/shop/sale/del',
-    method: 'post',
-    params
-  })
-}
-
-// 获取分类列表
-export function getCategoryList(params) {
-  return request({
-    url: '/sys/category/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取客户列表
-export function getCustomerList(params) {
-  return request({
-    url: '/k3/customer/search',
-    method: 'get',
-    params
-  })
-}
-
-// 改变支付方式
-export function changePay(params) {
-  return request({
-    url: '/shop/sale/change/payType',
-    method: 'post',
-    params
-  })
-}
-
-// 查询二维码支付状态
-export function checkPay(params) {
-  return request({
-    url: '/shop/sale/query/pay/status',
-    method: 'get',
-    params
-  })
-}
-
-// 网点支付配置列表
-export function payConfigList(params) {
-  return request({
-    url: '/shop/sale/pay-config-list',
-    method: 'get',
-    params
-  })
-}
-
-// 销售单类型统计
-export function salesOrderType(params) {
-  return request({
-    url: '/shop/sale/type/count',
-    method: 'get',
-    params
-  })
-}
-
-// 确认提货
-export function confirmDelivery(params) {
-  return request({
-    url: '/worker/sales/confirmDelivery',
-    method: 'post',
-    params
-  })
-}
-
-
-
-export function getNewSaleSheetList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/sale/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewSaleSheetList(data, name) {
-  return postBlob({
-    url: '/shop/sale/zfire/list/export',
-    data,
-    name
-  })
-}

+ 0 - 182
src/api/material-system/shop/transfer-sheet.js

@@ -1,182 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 新增调拨单
-export function addOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 审核直接调拨单
-export function examineOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/confirm',
-    method: 'post',
-    params
-  })
-}
-
-// 反审直接调拨单
-export function unAuditOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/unAudit',
-    method: 'post',
-    params
-  })
-}
-
-// 查询直接调拨单
-export function queryOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/query',
-    method: 'post',
-    params
-  })
-}
-
-// 删除调拨单
-export function delOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/del',
-    method: 'post',
-    params
-  })
-}
-
-// 编辑调拨单
-export function editOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取调拨单详情
-export function getOrderDetail(params) {
-  return request({
-    url: '/shop/stock/transfer/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 获取直接调拨单列表
-export function getMainList(params) {
-  return request({
-    url: '/shop/stock/transfer/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getShopList(params) {
-  return request({
-    url: '/shop/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取网点资料列表
-export function getTransferShopList(params) {
-  return request({
-    url: '/shop/master/transfer-list',
-    method: 'get',
-    params
-  })
-}
-
-// 仓库列表
-export function getStockList(params) {
-  return request({
-    url: '/shop/master/shop-stock',
-    method: 'get',
-    params
-  })
-}
-
-// 商品列表
-export function getGoodsList(params) {
-  return request({
-    url: '/shop/stock/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取调拨单列表
-export function getOrderList(params) {
-  return request({
-    url: '/shop/stock/transfer/c-list',
-    method: 'get',
-    params
-  })
-}
-
-// 提交调拨单
-export function submitOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/submit',
-    method: 'get',
-    params
-  })
-}
-
-// 撤消调拨单
-export function revokeOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/revoke',
-    method: 'get',
-    params
-  })
-}
-
-// 审核调拨单
-export function confirmOrder(params) {
-  return request({
-    url: '/shop/stock/transfer/cooperate/confirm',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewMainList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/stock/transfer/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewMainList(data, name) {
-  return postBlob({
-    url: '/shop/stock/transfer/zfire/list/export',
-    data,
-    name
-  })
-}
-
-export function getNewOrderList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/stock/transfer/c/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewOrderList(data, name) {
-  return postBlob({
-    url: '/shop/stock/transfer/zfire/list/export',
-    data,
-    name
-  })
-}
-

+ 0 - 91
src/api/material-system/shop/work-install-data.js

@@ -1,91 +0,0 @@
-import request,{postBlob} from '@/utils/request'
-
-// 工单安装数据列表
-export function getWorkInstallDataList(params) {
-  return request({
-    url: '/shop/work-install-data/list',
-    method: 'get',
-    params
-  })
-}
-
-// 工单安装数据详情
-export function getWorkInstallDataDetail(params) {
-  return request({
-    url: '/shop/work-install-data/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 新增工单安装数据
-export function addWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 修改工单安装数据
-export function editWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 工单安装数据提交
-export function submitWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/submit',
-    method: 'get',
-    params
-  })
-}
-
-// 工单安装数据撤消
-export function revokeWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/revoke',
-    method: 'get',
-    params
-  })
-}
-
-// 工单安装数据审核
-export function confirmWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/confirm',
-    method: 'get',
-    params
-  })
-}
-
-// 工单安装数据删除
-export function delWorkInstallData(params) {
-  return request({
-    url: '/shop/work-install-data/del',
-    method: 'get',
-    params
-  })
-}
-
-export function getNewWorkInstallDataList(data) {
-  console.log(data,999);
-  return request({
-    url: `/shop/work-install-data/zfire/list?moduleId=${data.moduleId}`,
-    method: "post",
-    data
-  });
-}
-
-// 导出
-export function exportNewWorkInstallDataList(data, name) {
-  return postBlob({
-    url: '/shop/work-install-data/zfire/list/export',
-    data,
-    name
-  })
-}

+ 603 - 0
src/views/auxiliaryFittings/shop/components/PurchaseArea.vue

@@ -0,0 +1,603 @@
+<template>
+  <el-form
+    class="pd"
+    ref="dataForm"
+    v-loading="loading"
+    :model="dataForm"
+    :rules="dataFormRules"
+    label-position="left"
+    label-width="90px"
+  >
+    <el-form-item v-if="formDisabled" label="单据编号" prop="sheetId">
+      <el-input disabled :value="dataForm.sheetId" />
+    </el-form-item>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-form-item label="网点" prop="shopId">
+          <el-select v-model="dataForm.shopId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
+            <el-option
+              v-for="(item, index) in authShop"
+              :key="index"
+              :label="shopLabelStrHandle(item)"
+              :value="item.shopId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="供应商" prop="venderId">
+          <el-select
+            v-model="dataForm.venderId"
+            filterable
+            :disabled="formDisabled"
+            placeholder="请选择供应商"
+            style="width: 100%"
+            @change="getVenderGoodsList"
+          >
+            <el-option
+              v-for="(item, index) in venderList"
+              :key="index"
+              :label="vendorLabelStrHandle(item)"
+              :value="item.venderId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="8">
+        <el-form-item label="采购日期" prop="purchaseTime">
+          <el-date-picker
+            v-model="dataForm.purchaseTime"
+            type="date"
+            placeholder="选择采购日期"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :disabled="inputParam.openType === 'view'"
+            style="width: 100%"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-form-item label="采购单图片" prop="image">
+      <template v-if="inputParam.openType !== 'view'">
+        <el-upload
+          v-loading="imageLoading"
+          element-loading-text="上传中"
+          element-loading-spinner="el-icon-loading"
+          element-loading-background="rgba(0, 0, 0, 0.8)"
+          :disabled="imageLoading"
+          class="avatar-uploader"
+          :action="baseURL + 'common/upload'"
+          :headers="myHeaders"
+          :show-file-list="false"
+          :on-success="uploadSuccess"
+          :before-upload="beforeUpload"
+          :on-error="uploadError"
+        >
+          <img v-if="dataForm.image" :src="$showImgUrl(dataForm.image)" class="avatar" alt="" />
+          <i v-else class="el-icon-plus avatar-uploader-icon" />
+          <div slot="tip" class="el-upload__tip" style="margin-top: 0; line-height: 20px">只支持上传jpg/png文件</div>
+        </el-upload>
+      </template>
+      <template v-else>
+        <el-image
+          style="width: 100px; height: 100px"
+          :src="$showImgUrl(dataForm.image)"
+          :preview-src-list="[$showImgUrl(dataForm.image)]"
+        />
+      </template>
+    </el-form-item>
+    <el-form-item v-if="dataForm.notes3" label="申请单备注">
+      <el-input v-model="dataForm.notes3" disabled />
+    </el-form-item>
+    <el-form-item v-if="dataForm.notes2" label="供应商备注">
+      <el-input v-model="dataForm.notes2" disabled />
+    </el-form-item>
+    <el-form-item label="备注" prop="notes">
+      <el-input
+        v-model="dataForm.notes"
+        autocomplete="off"
+        placeholder="备注"
+        :disabled="inputParam.openType === 'view'"
+      />
+    </el-form-item>
+    <el-row>
+      <el-col>
+        <el-divider>采购明细</el-divider>
+      </el-col>
+      <el-col>
+        <el-table
+          ref="goodsTable"
+          :data="dataForm.items"
+          max-height="500"
+          size="mini"
+          border
+          header-cell-class-name="headerRowColor"
+          show-summary
+          :summary-method="getSummaries"
+          class="detail-table"
+        >
+          <el-table-column prop="goodsId" label="辅材编号" />
+          <el-table-column prop="goodsName" label="辅材名称" min-width="180" />
+          <el-table-column prop="purchaseQty" label="订货数量" header-align="left" align="center" />
+          <el-table-column prop="deliverQty" label="供应数量" header-align="left" align="center" />
+          <el-table-column prop="estimateCost" label="预估进价" header-align="left" align="center" />
+          <el-table-column prop="cost" label="进价" header-align="left" align="center">
+            <template slot-scope="{ $index, row }">
+              <label v-if="inputParam.openType === 'view'">{{ row.cost }}</label>
+              <el-form-item
+                v-else
+                style="margin: 18px 0"
+                label-width="0"
+                size="mini"
+                :prop="'items.' + $index + '.cost'"
+                :rules="dataFormRules.cost"
+              >
+                <el-input v-model="row.cost" size="mini" @change="changeCostValue($index, row)" />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="recQty" label="验收数量" header-align="left" align="center" width="100">
+            <template slot-scope="{ $index, row }">
+              <label v-if="inputParam.openType === 'view'">{{ row.recQty + ' /' + row.measureUnit }}</label>
+              <el-form-item
+                v-else
+                style="margin: 18px 0"
+                label-width="0"
+                size="mini"
+                :prop="'items.' + $index + '.recQty'"
+                :rules="dataFormRules.recQty"
+              >
+                <el-input v-model="row.recQty" size="mini" @change="changeCostValue($index, row)">
+                  <template slot="suffix">{{ row.measureUnit }}</template>
+                </el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="recGiftQty" label="赠品数量" header-align="left" align="center">
+            <template slot-scope="{ $index, row }">
+              <label v-if="inputParam.openType === 'view'">{{ row.recGiftQty + ' /' + row.measureUnit }}</label>
+              <el-form-item
+                v-else
+                style="margin: 18px 0"
+                label-width="0"
+                size="mini"
+                :prop="'items.' + $index + '.recGiftQty'"
+                :rules="dataFormRules.recGiftQty"
+              >
+                <el-input v-model="row.recGiftQty" size="mini">
+                  <template slot="suffix">{{ row.measureUnit }}</template>
+                </el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column prop="costValue" label="验收金额" header-align="left" align="center" />
+          <el-table-column prop="inStockQty" label="入库数量" header-align="left" align="center" width="100">
+            <template slot-scope="{ $index, row }">
+              <label>{{ row.inStockQty + ' ' + row.salesUnit }}</label>
+            </template>
+          </el-table-column>
+          <el-table-column prop="inStockCost" label="入库进价" header-align="left" align="center" width="100">
+            <template slot-scope="{ $index, row }">
+              <label>{{ row.inStockCost + ' 元/' + row.salesUnit }}</label>
+            </template>
+          </el-table-column>
+          <el-table-column prop="measureUnit" label="采购单位" />
+          <el-table-column prop="unitQty" label="转换系数" header-align="left" align="center" width="95" />
+          <el-table-column prop="salesUnit" label="售卖单位" />
+          <el-table-column prop="productModel" label="商品型号" />
+          <el-table-column prop="specification" label="规格" />
+        </el-table>
+        <el-row>
+          <el-col :span="24"
+            ><div>共 {{ goodsTotalCount }} 条记录</div></el-col
+          >
+        </el-row>
+      </el-col>
+    </el-row>
+    <div style="text-align: right">
+      <el-button @click="cancelForm">取 消</el-button>
+      <el-button v-if="checkBtn('edit')" type="primary" :disabled="saveBtn" @click="submitForm('edit')"
+        >保 存</el-button
+      >
+      <el-button v-if="checkBtn('confirm')" type="success" @click="confirmSheet(dataForm.sheetId)">审 核</el-button>
+    </div>
+    <el-dialog
+      width="70%"
+      title="商品列表"
+      :visible.sync="innerVisible"
+      :close-on-click-modal="false"
+      @close="$refs.goodsTable.clearSelection()"
+    >
+      <el-input
+        v-model="searchGoods"
+        size="small"
+        placeholder="输入 辅材名称 或 规格 模糊搜索"
+        style="margin-bottom: 5px"
+        :clearable="true"
+      />
+      <el-table
+        ref="goodsTable"
+        :data="
+          goodsList.filter(
+            data =>
+              !searchGoods ||
+              data.goodsName.toLowerCase().includes(searchGoods.toLowerCase()) ||
+              data.specification.toLowerCase().includes(searchGoods.toLowerCase())
+          )
+        "
+        :row-key="getRowKeys"
+        height="400"
+        size="mini"
+        border
+        header-cell-class-name="headerRowColor"
+        style="width: 100%"
+      >
+        <el-table-column type="selection" width="55" :reserve-selection="true" />
+        <el-table-column prop="goodsId" label="辅材编号" />
+        <el-table-column prop="goodsCode" label="辅材代码" />
+        <el-table-column prop="goodsName" label="辅材名称" />
+        <el-table-column prop="categoryName" label="小类名称" />
+        <el-table-column prop="productModel" label="商品型号" />
+        <el-table-column prop="specification" label="规格" />
+        <el-table-column prop="qty" label="库存数量" />
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="selGoods">确 定</el-button>
+      </div>
+    </el-dialog>
+  </el-form>
+</template>
+
+<script>
+import { getVenderGoodsList, getVenderList } from '@/api/material-system/vender'
+import { computeVal } from '@/api/material-system/common'
+import { getToken } from '@/utils/auth'
+import {
+  addPurchaseSheet,
+  confirmPurchaseSheet,
+  editPurchaseSheet,
+  getPurchaseSheet
+} from '@/api/material-system/shop/purchase-sheet'
+
+export default {
+  name: 'PurchaseArea',
+  props: {
+    inputParam: {
+      type: Object,
+      default: function () {
+        return {
+          openType: 'add',
+          sheetId: ''
+        }
+      }
+    }
+  },
+  data() {
+    const validateCost = (rule, value, callback) => {
+      this.saveBtn = true
+      if (Number.isNaN(parseFloat(value))) {
+        return callback(new Error('请输入数字值'))
+      }
+      if (parseFloat(value) < 0) {
+        return callback(new Error('不能少于0'))
+      }
+      this.saveBtn = false
+      callback()
+    }
+    const validateRecQty = (rule, value, callback) => {
+      // const index = /^items\.([0-9]+)\.recQty/.exec(rule.fullField)[1]
+      // const deliverQty = this.dataForm.items[index].deliverQty
+      this.saveBtn = true
+      if (Number.isNaN(parseFloat(value))) {
+        return callback(new Error('请输入数字值'))
+      }
+      if (parseFloat(value) < 0) {
+        return callback(new Error('不能少于0'))
+      }
+      // if (index && deliverQty && parseFloat(value) > parseFloat(deliverQty)) {
+      //   return callback(new Error('不能大于供应'))
+      // }
+      this.saveBtn = false
+      callback()
+    }
+    const validateRecGiftQty = (rule, value, callback) => {
+      this.saveBtn = true
+      if (Number.isNaN(parseFloat(value))) {
+        return callback(new Error('请输入数字值'))
+      }
+      if (parseFloat(value) < 0) {
+        return callback(new Error('不能少于0'))
+      }
+      this.saveBtn = false
+      callback()
+    }
+    return {
+      imageLoading: false,
+      loading: true,
+      baseURL: process.env.VUE_APP_BASE_API,
+      myHeaders: { 'x-token': getToken() },
+      dataForm: {
+        sheetId: '', // 单据ID
+        shopId: '', // 网点ID
+        shopName: '', // 网点名称
+        venderId: '', // 供应商ID
+        venderName: '', // 供应商名称
+        purchaseTime: '', // 采购日期
+        image: '',
+        notes: '', // 备注
+        flag: '',
+        items: [] // 关系辅材列表
+      },
+      dataFormRules: {
+        purchaseTime: [{ require: true, message: '请选择采购日期', trigger: 'blur' }],
+        cost: [{ validator: validateCost, trigger: 'blur' }],
+        recQty: [{ validator: validateRecQty, trigger: 'blur' }],
+        recGiftQty: [{ validator: validateRecGiftQty, trigger: 'blur' }]
+      },
+      orgDataForm: {},
+      goodsList: [], // 商品列表
+      venderList: [], // 供应商列表
+      innerVisible: false,
+      searchGoods: '',
+      saveBtn: false // 保存按钮状态
+    }
+  },
+  computed: {
+    formDisabled() {
+      return this.inputParam.openType === 'view' || this.dataForm.sheetId !== ''
+    },
+    goodsTotalCount: function () {
+      return this.dataForm && this.dataForm.items ? this.dataForm.items.length : 0
+    }
+  },
+  watch: {
+    // 网点变动重新执行辅材获取资料
+    'shopPurchaseForm.shopId': function () {
+      this.getVenderGoodsList(this.dataForm.venderId)
+    },
+    searchGoods: function () {
+      this.$refs.goodsTable.clearSelection()
+    }
+  },
+  mounted() {
+    this.getVenderList()
+    this.getDetail()
+  },
+  methods: {
+    getDetail(id) {
+      this.loading = true
+      const openType = this.inputParam.openType
+      const sheetId = id || this.inputParam.sheetId
+      if (openType !== 'add') {
+        getPurchaseSheet({ sheetId }).then(res => {
+          this.setDataForm(res.data)
+          if (openType !== 'view') {
+            this.getVenderGoodsList(this.dataForm.venderId)
+          }
+          this.loading = false
+        })
+      } else {
+        this.loading = false
+      }
+    },
+    cancelForm() {
+      this.$emit('getList')
+      this.$emit('update:isOpen', false)
+    },
+    submitForm(type) {
+      if (this.dataForm.items && this.dataForm.items.length === 0) {
+        this.$errorMsg('请添加商品后再保存!')
+        return
+      }
+      this.$refs.dataForm.validate(valid => {
+        if (!this.dataForm.image) {
+          this.$errorMsg('请添加附件图片')
+          return
+        }
+        if (valid) {
+          if (type === 'edit') {
+            editPurchaseSheet(this.dataForm).then(() => {
+              this.getDetail(this.dataForm.sheetId)
+              this.$successMsg('保存成功')
+            })
+          } else {
+            this.dataForm.shopName = this.getArraysName(this.authShop, this.dataForm, 'shopId', 'shopName')
+            this.dataForm.venderName = this.getArraysName(this.venderList, this.dataForm, 'venderId', 'venderName')
+            addPurchaseSheet(this.dataForm).then(res => {
+              this.inputParam.openType = 'edit'
+              this.setDataForm(res.data)
+              this.$successMsg('保存成功')
+            })
+          }
+        }
+      })
+    },
+    setDataForm(data) {
+      this.dataForm = {
+        sheetId: data.sheetId, // 单据编号
+        shopId: data.shopId, // 网点ID
+        venderId: data.venderId, // 供应商Id
+        purchaseTime: data.purchaseTime, // 采购日期
+        flag: data.flag,
+        image: data.image,
+        notes: data.notes, // 备注
+        items: data.items // 关系商品列表
+      }
+      Object.assign(this.orgDataForm, this.dataForm)
+    },
+    checkBtn(type) {
+      const typeMap = {
+        add: this.inputParam.openType === type,
+        edit: this.dataForm.flag === 2 && this.inputParam.openType === type,
+        confirm:
+          this.dataForm.flag === 2 &&
+          this.dataForm.sheetId !== '' &&
+          this.orgDataForm.purchaseTime &&
+          this.orgDataForm.image
+      }
+      // 检查按钮权限
+      return this.checkBtnRole(type) && typeMap[type]
+    },
+    // 获取供应商列表
+    getVenderList() {
+      getVenderList({ pageNum: 1, pageSize: -1, flag: 1 }).then(res => {
+        this.venderList = res.data.records
+      })
+    },
+    // 获取供应商关系辅材列表
+    getVenderGoodsList(val) {
+      if (val) {
+        getVenderGoodsList({
+          pageNum: 1,
+          pageSize: -1,
+          venderId: val,
+          flag: 1,
+          status: 1,
+          shopId: this.dataForm.shopId
+        }).then(res => {
+          this.goodsList = res.data.records
+        })
+      }
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'costValue') {
+          let count = 0
+          sums[index] = values.reduce((prev, curr) => {
+            const suffix = (curr + '').split('.')
+            if (suffix.length > 1) {
+              count = suffix[1].length > count ? suffix[1].length : count
+            }
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] = parseFloat(sums[index]).toFixed(count)
+        }
+      })
+      return sums
+    },
+    // 进价或验收数量变动
+    changeCostValue(index, row) {
+      computeVal({
+        frontVal: row.recQty,
+        afterVal: row.cost,
+        operator: '*',
+        scale: 4
+      }).then(res => {
+        this.dataForm.items[index].costValue = res.data
+      })
+    },
+    // 选中辅材添加到表单中
+    selGoods() {
+      this.searchGoods = ''
+      this.$refs.goodsTable.selection.forEach(value => {
+        const index = this.dataForm.items.findIndex(item => {
+          return item.goodsId === value.goodsId
+        })
+        // 添加不在列表的商品
+        if (index < 0) {
+          this.dataForm.items.push({
+            goodsId: value.goodsId,
+            goodsName: value.goodsName,
+            cost: value.cost,
+            ndays: value.ndays,
+            purchaseQty: 0,
+            recQty: 0,
+            measureUnit: value.measureUnit,
+            unitQty: value.unitQty,
+            salesUnit: value.salesUnit,
+            recGiftQty: 0,
+            costValue: 0,
+            productModel: value.productModel,
+            specification: value.specification
+          })
+        }
+      })
+      this.$refs.goodsTable.clearSelection()
+      this.innerVisible = false
+    },
+    // 删除明细
+    delItem(index) {
+      this.dataForm.items.splice(index, 1)
+    },
+    getRowKeys(row) {
+      return row.goodsId
+    },
+    // 上传成功回调
+    uploadSuccess(res) {
+      this.imageLoading = false
+      this.dataForm.image = res.data.url
+    },
+    // 上传前检查
+    beforeUpload(file) {
+      if (this.imageLoading) {
+        this.$errorMsg('文件上传中,稍后再试!')
+        return false
+      }
+      const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1)
+      const whiteList = ['jpg', 'jpeg', 'png']
+      if (whiteList.indexOf(fileSuffix) === -1) {
+        this.$errorMsg('只支持上传jpg/png文件!')
+        return false
+      }
+      this.imageLoading = true
+    },
+    uploadError() {
+      this.imageLoading = false
+    },
+    // 审核 采购入库单
+    confirmSheet(sheetId) {
+      this.$confirm(
+        `此操作将审核 ${sheetId} 单据,<span style="color: #ff0000;">当前内容如果已修改将忽略保存</span>,是否继续?`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+          dangerouslyUseHTMLString: true
+        }
+      )
+        .then(() => {
+          this.loading = true
+          confirmPurchaseSheet({ sheetId: sheetId }).then(
+            () => {
+              setTimeout(() => {
+                this.inputParam.openType = 'view'
+                this.getDetail(sheetId)
+                this.$successMsg('审核成功')
+                this.loading = false
+              }, 2000)
+            },
+            () => {
+              this.loading = false
+            }
+          )
+        })
+        .catch(() => console.log('取消'))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.detail-table {
+  width: 100%;
+  margin: 15px 0;
+  ::v-deep .el-input__suffix-inner {
+    color: red;
+  }
+}
+.pd {
+  padding: 20px 20px 0 20px;
+}
+</style>

+ 0 - 259
src/views/auxiliaryFittings/shop/purchase-apply-sheet/index.vue

@@ -25,266 +25,7 @@
         :tableEvents="tableEvents"
       >
       </template-page>
-      <!-- <div class="screen-container">
-        <div class="top clearfix">
-          <div class="title fl">条件筛选</div>
-        </div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="90px"
-          size="small"
-          label-position="left"
-        >
-          <el-row :gutter="20">
-            <el-col v-if="showShopInfo" :xs="24" :sm="12" :lg="6">
-              <el-form-item label="网点" prop="shopId">
-                <el-select
-                  v-model="screenForm.shopId"
-                  filterable
-                  style="width: 100%;"
-                  size="small"
-                >
-                  <el-option label="全部网点" value="" />
-                  <el-option
-                    v-for="(item, index) in authShop"
-                    :key="index"
-                    :label="shopLabelStrHandle(item)"
-                    :value="item.shopId"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据编号" prop="sheetId">
-                <el-input
-                  v-model="screenForm.sheetId"
-                  placeholder="单据编号"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="userType !== 3" :xs="24" :sm="12" :lg="6">
-              <el-form-item label="供应商名称" prop="keyword">
-                <el-input
-                  v-model="screenForm.keyword"
-                  placeholder="供应商名称"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="单据状态" prop="flag">
-                <el-select
-                  v-model="screenForm.flag"
-                  placeholder="单据状态"
-                  size="small"
-                >
-                  <el-option label="全部状态" value="" />
-                  <el-option
-                    v-for="(item, index) in sheetFlagStr('select', null, [
-                      0,
-                      1
-                    ])"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="12">
-              <el-form-item label="创建日期" prop="createTime">
-                <el-date-picker
-                  v-model="screenForm.createTime"
-                  type="datetimerange"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  size="small"
-                  style="margin-right: 10px;"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :xs="12" :sm="12" :lg="12" class="tl">
-              <el-button
-                v-if="checkBtnRole('add')"
-                size="small"
-                type="primary"
-                icon="el-icon-plus"
-                @click="addOrEdit('add')"
-                >新增单据</el-button
-              >
-            </el-col>
-            <el-col :xs="12" :sm="12" :lg="12" class="tr">
-              <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm"
-                  >清空</el-button
-                >
-                <el-button size="small" type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div> -->
-
-      <!-- <div class="mymain-container">
-        <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            size="mini"
-            border
-            header-cell-class-name="headerRowColor"
-            highlight-current-row
-          >
-            <el-table-column type="expand">
-              <template slot-scope="scope">
-                <el-form label-position="left" inline class="demo-table-expand">
-                  <el-form-item label="备注">
-                    <span>{{ scope.row.notes3 }}</span>
-                  </el-form-item>
-                </el-form>
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="操作">
-              <template slot-scope="{ row }">
-                <el-dropdown @command="handleCommand">
-                  <el-button type="text">
-                    更多<i class="el-icon-arrow-down el-icon--right" />
-                  </el-button>
-                  <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item
-                      v-if="checkBtnRole('view')"
-                      icon="el-icon-view"
-                      :command="[row.sheetId, 'view']"
-                      >查看</el-dropdown-item
-                    >
-                    <template v-if="row.flag === 0">
-                      <el-dropdown-item
-                        v-if="checkBtnRole('edit')"
-                        icon="el-icon-edit"
-                        :command="[row.sheetId, 'edit']"
-                        >编辑</el-dropdown-item
-                      >
-                      <el-dropdown-item
-                        v-if="checkBtnRole('submit')"
-                        icon="el-icon-lock"
-                        :command="[row.sheetId, 'submit']"
-                        >提交</el-dropdown-item
-                      >
-                      <el-dropdown-item
-                        v-if="checkBtnRole('del')"
-                        icon="el-icon-delete"
-                        :command="[row.sheetId, 'del']"
-                        >删除</el-dropdown-item
-                      >
-                    </template>
-                    <template v-if="row.flag === 1">
-                      <el-dropdown-item
-                        v-if="checkBtnRole('revoke')"
-                        icon="el-icon-unlock"
-                        :command="[row.sheetId, 'revoke']"
-                        >撤消</el-dropdown-item
-                      >
-                    </template>
-                  </el-dropdown-menu>
-                </el-dropdown>
-              </template>
-            </el-table-column>
-            <el-table-column
-              align="center"
-              label="单号"
-              prop="sheetId"
-              min-width="190"
-            >
-              <template slot-scope="{ row }">
-                <el-link
-                  v-if="checkBtnRole('view')"
-                  type="primary"
-                  :underline="false"
-                  @click="handleCommand([row.sheetId, 'view'])"
-                  >{{ row.sheetId }}</el-link
-                >
-                <span v-else>{{ row.sheetId }}</span>
-              </template>
-            </el-table-column>
-            <template v-if="showShopInfo">
-              <el-table-column
-                align="center"
-                label="网点编号"
-                prop="shopId"
-                width="80"
-              />
-              <el-table-column
-                align="center"
-                label="网点名称"
-                prop="shopName"
-                min-width="140"
-                show-overflow-tooltip
-              />
-            </template>
-            <el-table-column
-              align="center"
-              label="供应商编号"
-              prop="venderId"
-              width="100"
-            />
-            <el-table-column
-              align="center"
-              label="供应商名称"
-              prop="venderName"
-              min-width="140"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="创建人"
-              prop="createBy"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="center"
-              label="创建时间"
-              prop="createTime"
-              min-width="160"
-            />
-            <el-table-column
-              align="center"
-              label="状态"
-              class-name="status-col"
-            >
-              <template slot-scope="{ row }">
-                <el-tag :type="row.flag === 0 ? 'success' : 'danger'">{{
-                  sheetFlagStr("label", row.flag)
-                }}</el-tag>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-
-        <div class="pagination clearfix">
-          <div class="fr">
-            <el-pagination
-              :current-page="currentPage"
-              :page-sizes="[10, 20, 30, 50]"
-              :page-size="10"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="listTotal"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-            />
-          </div>
-        </div>
-      </div> -->
     </div>
-
     <!-- 新增编辑单据 -->
     <purchase-apply-area
       v-if="purchaseApplyArea"

+ 445 - 0
src/views/auxiliaryFittings/shop/purchase-sheet/index.vue

@@ -0,0 +1,445 @@
+<template>
+  <div style="height: 100%">
+    <div v-show="!purchaseArea" style="height: 100%">
+      <template-page
+        ref="pageRef"
+        :loading="listLoading"
+        :getList="getList"
+        :exportList="exportList"
+        :columnParsing="columnParsing"
+        :operation="operation()"
+        :tableAttributes="tableAttributes"
+        :tableEvents="tableEvents"
+      >
+      </template-page>
+    </div>
+    <template v-if="purchaseArea && purchaseAreaParam.openType === 'add'">
+      <el-page-header class="pdt" content="新增采购订单" @back="backUpdPage" />
+      <el-divider />
+    </template>
+    <template v-else-if="purchaseArea && purchaseAreaParam.openType !== 'add'">
+      <el-page-header
+        class="pdt"
+        :content="purchaseAreaParam.openType === 'view' ? '查看采购订单' : '编辑采购订单'"
+        @back="backUpdPage"
+      />
+      <el-divider />
+    </template>
+    <!-- 新增编辑单据 -->
+    <purchase-area
+      v-if="purchaseArea"
+      :is-open.sync="purchaseArea"
+      :input-param="purchaseAreaParam"
+      @getList="$refs.pageRef.refreshList()"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  confirmPurchaseSheet,
+  unAuditPurchaseSheet,
+  pushPurchaseSheet,
+  delPurchaseSheet,
+  copyPurchaseSheet,
+  getPurchaseSheetList,
+  revokePurchaseSheet,
+  getNewPurchaseSheetList,
+  exportNewPurchaseSheetList
+} from '@/api/material-system/shop/purchase-sheet'
+import { downloadFiles, handleImport } from '@/utils/util'
+import { getToken } from '@/utils/auth'
+import PurchaseArea from '../components/PurchaseArea'
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+export default {
+  name: 'PurchaseSheet',
+  components: { PurchaseArea, TemplatePage },
+  mixins: [import_mixin],
+
+  filters: {
+    syncFilter(value) {
+      const syncMap = {
+        0: '待处理',
+        1: '待同步',
+        2: '非同步',
+        3: '已同步',
+        99: '取消同步'
+      }
+      return syncMap[value]
+    }
+  },
+  data() {
+    return {
+      purchaseArea: false,
+      purchaseAreaParam: {
+        openType: 'add',
+        sheetId: ''
+      },
+      baseURL: process.env.VUE_APP_BASE_API,
+      myHeaders: { 'x-token': getToken() },
+      dataList: null, // 列表数据
+      listLoading: false, // 列表加载loading
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      screenForm: {
+        // 筛选表单数据
+        verifyTime: '', // 创建时间
+        flag: '', // 状态
+        keyword: '', // 关键词
+        sheetId: '', // 单据编号
+        shopId: ''
+      },
+      importLoading: false, // 导入加载loading
+      importResult: null, // 导入结果
+      importFileList: [], // 导入列表
+      // 事件组合
+      optionsEvensGroup: [
+        [
+          [
+            {
+              name: '新增单据',
+              click: () => {
+                this.addOrEdit('add')
+              },
+              isRole: this.checkBtnRole('add')
+            }
+          ]
+        ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true,
+        columnExpand: (h, { row, index, columm }) => {
+          return (
+            <div style="padding-left:95px">
+              <el-form label-position="left" inline class="demo-table-expand">
+                <el-form-item label="执行信息">
+                  <span>{row.remark}</span>
+                </el-form-item>
+                <el-form-item label="备注">
+                  <span>{row.notes}</span>
+                </el-form-item>
+              </el-form>
+            </div>
+          )
+        }
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: []
+    }
+  },
+  created() {
+    // this.$refs.screenForm.resetFields();
+  },
+  methods: {
+    // 查询列表
+    // getList() {
+    //   this.listLoading = true;
+
+    //   const params = {
+    //     shopId: this.screenForm.shopId,
+    //     flag: this.screenForm.flag,
+    //     venderName: this.screenForm.keyword,
+    //     sheetId: this.screenForm.sheetId,
+    //     startTime: this.screenForm.createTime
+    //       ? this.screenForm.createTime[0]
+    //       : "",
+    //     endTime: this.screenForm.createTime
+    //       ? this.screenForm.createTime[1]
+    //       : "",
+    //     pageNum: this.currentPage,
+    //     pageSize: this.pageSize
+    //   };
+    //   getPurchaseSheetList(params).then(res => {
+    //     this.dataList = res.data.records;
+    //     this.listTotal = res.data.total;
+    //     this.listLoading = false;
+    //   });
+    // },
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.currentPage = 1
+      this.$refs.pageRef.refreshList()
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val
+      this.$refs.pageRef.refreshList()
+    },
+    // 重置筛选表单
+    resetScreenForm() {
+      this.currentPage = 1
+      this.$refs.pageRef.refreshList()
+    },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1
+      this.$refs.pageRef.refreshList()
+    },
+    // 新增编辑 采购入库单
+    addOrEdit(type, id) {
+      this.purchaseArea = true
+      this.purchaseAreaParam.openType = type
+      this.purchaseAreaParam.sheetId = id
+    },
+    // 删除单据
+    revokeSheet(sheetId) {
+      this.$confirm(`此操作将作废 ${sheetId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          revokePurchaseSheet({ sheetId: sheetId }).then(() => {
+            this.$refs.pageRef.refreshList()
+            this.$successMsg('作废成功')
+          })
+        })
+        .catch(() => console.log('取消'))
+    },
+    // 删除单据
+    delSheet(sheetId) {
+      this.$confirm(`此操作将删除 ${sheetId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          delPurchaseSheet({ sheetId: sheetId }).then(() => {
+            this.$refs.pageRef.refreshList()
+            this.$successMsg('删除成功')
+          })
+        })
+        .catch(() => console.log('取消'))
+    },
+    // 审核 采购入库单
+    confirmSheet(sheetId) {
+      this.$confirm(`此操作将审核 ${sheetId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+          confirmPurchaseSheet({ sheetId: sheetId }).then(
+            () => {
+              setTimeout(() => {
+                this.$refs.pageRef.refreshList()
+                this.$successMsg('审核成功')
+                this.listLoading = false
+              }, 2000)
+            },
+            () => {
+              this.listLoading = false
+            }
+          )
+        })
+        .catch(() => console.log('取消'))
+    },
+
+    // 反审 采购入库单
+    unAuditSheet(sheetId) {
+      this.$confirm(`此操作将反审 ${sheetId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+          unAuditPurchaseSheet({ sheetId: sheetId }).then(
+            () => {
+              setTimeout(() => {
+                this.$refs.pageRef.refreshList()
+                this.$successMsg('反审成功')
+                this.listLoading = false
+              }, 2000)
+            },
+            () => {
+              this.listLoading = false
+            }
+          )
+        })
+        .catch(() => console.log('取消'))
+    },
+
+    // 下推 采购入库单
+    pushSheet(sheetId) {
+      this.$confirm(`此操作将下推 ${sheetId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.listLoading = true
+          pushPurchaseSheet({ sheetId: sheetId }).then(
+            () => {
+              setTimeout(() => {
+                // this.$successMsg('下推成功')
+                this.$confirm(`是否跳转到采购入库单 ${sheetId} 单据,是否继续?`, '下推成功', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'success'
+                })
+                  .then(() => {
+                    this.$router.push({
+                      name: 'purchase-in-stock-sheet',
+                      params: {
+                        sheetId
+                      }
+                    })
+                  })
+                  .catch(() => this.getList())
+                this.listLoading = false
+              }, 2000)
+            },
+            () => {
+              this.listLoading = false
+            }
+          )
+        })
+        .catch(() => console.log('取消'))
+    },
+
+    // 导出
+    exportSheet() {
+      const screenData = {
+        flag: this.screenForm.flag,
+        venderName: this.screenForm.keyword,
+        sheetId: this.screenForm.sheetId,
+        startTime: this.screenForm.createTime ? this.screenForm.createTime[0] : '',
+        endTime: this.screenForm.createTime ? this.screenForm.createTime[1] : ''
+      }
+      downloadFiles('shop/purchase/export', screenData)
+    },
+    // 下载导入模版
+    handleDownload() {
+      downloadFiles('shop/purchase/template/download')
+    },
+    // 导入
+    async handleImport(param) {
+      this.importLoading = true
+      const file = param.file
+      const formData = new FormData()
+      formData.append('file', file)
+      const result = await handleImport('shop/purchase/import', formData)
+      this.importLoading = false
+      this.importFileList = []
+      if (result.code === 1) {
+        this.$successMsg('导入成功')
+        this.$refs.pageRef.refreshList()
+      } else {
+        await this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
+      }
+    },
+    // 复制 采购入库单
+    copySheet(sheetId) {
+      copyPurchaseSheet({ sheetId: sheetId }).then(() => {
+        this.$refs.pageRef.refreshList()
+        this.$successMsg('复制成功')
+      })
+    },
+    // 操作事件
+    handleCommand(param) {
+      if (param[1] === 'view' || param[1] === 'edit') {
+        this.addOrEdit(param[1], param[0])
+      } else {
+        this[param[1] + 'Sheet'](param[0])
+      }
+    },
+    backUpdPage() {
+      this.$refs.pageRef.refreshList()
+      this.purchaseArea = false
+    },
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return getNewPurchaseSheetList(...p)
+    },
+    // 列表导出函数
+    exportList: exportNewPurchaseSheetList,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return (
+          <div class="operation-btns">
+            <el-dropdown
+              onCommand={p => {
+                this.handleCommand(p)
+              }}
+            >
+              <el-button type="text">
+                更多
+                <i class="el-icon-arrow-down el-icon--right" />
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                {this.checkBtnRole('view') ? (
+                  <el-dropdown-item icon="el-icon-view" command={[row.sheetId, 'view']}>
+                    查看
+                  </el-dropdown-item>
+                ) : null}
+                {row.flag === 2 ? (
+                  <div>
+                    {this.checkBtnRole('edit') ? (
+                      <el-dropdown-item icon="el-icon-edit" command={[row.sheetId, 'edit']}>
+                        编辑
+                      </el-dropdown-item>
+                    ) : null}
+
+                    {this.checkBtnRole('confirm') ? (
+                      <el-dropdown-item icon="el-icon-circle-check" command={[row.sheetId, 'confirm']}>
+                        审核
+                      </el-dropdown-item>
+                    ) : null}
+                    {this.checkBtnRole('revoke') ? (
+                      <el-dropdown-item icon="el-icon-unlock" command={[row.sheetId, 'revoke']}>
+                        作废
+                      </el-dropdown-item>
+                    ) : null}
+                  </div>
+                ) : null}
+                {row.flag === 100 ? (
+                  <div>
+                    {this.checkBtnRole('unAudit') &&
+                    (row.execFlag === 1 || (row.execFlag === 3 && row.kingDeePosition === 1)) ? (
+                      <el-dropdown-item icon="el-icon-circle-check" command={[row.sheetId, 'unAudit']}>
+                        反审
+                      </el-dropdown-item>
+                    ) : null}
+                  </div>
+                ) : null}
+                {this.checkBtnRole('push') && row.execFlag === 3 && row.kingDeePosition === 1 ? (
+                  <el-dropdown-item icon="el-icon-download" command={[row.sheetId, 'push']}>
+                    下推
+                  </el-dropdown-item>
+                ) : null}
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        )
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pdt {
+  padding: 20px 20px 0 20px;
+}
+</style>

+ 36 - 1
src/views/setting/account/index.vue

@@ -229,6 +229,24 @@
                 <el-switch v-model="addForm.pubNotice" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
               </el-form-item>
             </el-col>
+            <el-col :md="6">
+              <el-form-item label="是否供应商" prop="isVender" label-width="120px">
+                <el-switch v-model="addForm.isVender" active-color="#13ce66" inactive-color="#ff4949"> </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :md="6">
+              <el-form-item label="供应商" prop="venderId">
+                <el-select v-model="addForm.venderId" placeholder="请选择供应商" style="width: 100%" filterable>
+                  <el-option
+                    v-for="(item, index) in venderList"
+                    :key="index"
+                    :label="item.venderName"
+                    :value="item.venderId"
+                    :disabled="item.status !== 'ON'"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -285,6 +303,7 @@ import {
   getMerchantList
 } from '@/api/setting'
 import { adminDeptTreeWebsit } from '@/api/departmentManagement.js'
+import { listPageV2 } from '@/api/auxiliaryFittings/supplier'
 export default {
   data() {
     var validatePass = (rule, value, callback) => {
@@ -330,6 +349,7 @@ export default {
       }
     }
     return {
+      venderList: [],
       userName: JSON.parse(localStorage.getItem('greemall_user')).userName,
       dataList: null, // 列表数据
       listLoading: true, // 列表加载loading
@@ -371,6 +391,8 @@ export default {
         newPassword: '', // 新密码
         confirmPassword: '', // 确认密码
         pubNotice: true,
+        isVender: true,
+        venderId: '',
         linkPhone: '',
         rwaide: []
       },
@@ -405,7 +427,6 @@ export default {
   methods: {
     getList() {
       this.listLoading = true
-
       let params = {
         roleId: this.screenForm.role,
         status: this.screenForm.status,
@@ -564,6 +585,16 @@ export default {
         key: type,
         label: { add: '新增', edit: '编辑' }[type],
         triggerEvent: async () => {
+          listPageV2({
+            pageNum: 1,
+            pageSize: -1,
+            params: [
+              { param: 'a.status', compare: '=', value: 'ON' },
+              { param: 'a.vender_type', compare: 'like', value: '辅材' }
+            ]
+          }).then(res => {
+            this.venderList = res.data.records
+          })
           this.cancelAddForm()
           this.addFormType = type
           this.departmentList = await this.getDepartmentList()
@@ -575,6 +606,8 @@ export default {
                 role: res.data.roleId,
                 nickName: res.data.nickName,
                 pubNotice: res.data.pubNotice,
+                isVender: res.data.isVender,
+                venderId: res.data.venderId,
                 adminWebsitId: res.data.adminWebsitId,
                 adminDeptId: res.data.adminDeptId,
                 linkPhone: res.data.linkPhone,
@@ -620,6 +653,8 @@ export default {
             roleId: this.addForm.role,
             password: this.addForm.newPassword,
             pubNotice: this.addForm.pubNotice,
+            isVender: this.addForm.isVender,
+            venderId: this.addForm.venderId,
             linkPhone: this.addForm.linkPhone,
             adminDeptId: rwaideObjs.filter(item => !item.isWebsit).map(item => item.adminDeptId),
             adminWebsitId: rwaideObjs.filter(item => item.isWebsit).map(item => item.adminDeptId)