chenrui 4 rokov pred
rodič
commit
2c473270e6
100 zmenil súbory, kde vykonal 3020 pridanie a 2745 odobranie
  1. 2 2
      src/api/allocLinkageOut.js
  2. 2 2
      src/api/allocLinkagePut.js
  3. 2 2
      src/api/allocWarehouse.js
  4. 1 1
      src/api/custType.js
  5. 1 1
      src/api/customer.js
  6. 3 18
      src/api/data.js
  7. 12 1
      src/api/dealerProduct.js
  8. 1 1
      src/api/dealerProductBrand.js
  9. 1 1
      src/api/giftsDetail.js
  10. 77 0
      src/api/purchase.js
  11. 37 0
      src/api/purchaseDetail.js
  12. 77 0
      src/api/purchaseRerurn.js
  13. 29 0
      src/api/purchaseRerurnDetail.js
  14. 65 1
      src/api/sales.js
  15. 37 0
      src/api/salesDetail.js
  16. 77 0
      src/api/salesRerurn.js
  17. 29 0
      src/api/salesRerurnDetail.js
  18. 2 2
      src/api/stock.js
  19. 2 2
      src/api/storeCallOut.js
  20. 1 1
      src/api/urgent.js
  21. 1 1
      src/api/urgentDetail.js
  22. 5 7
      src/api/warehouse.js
  23. 60 82
      src/config/router.config.js
  24. 5 0
      src/libs/tools.js
  25. 49 48
      src/views/allocationManagement/chainTransferIn/detail.vue
  26. 75 79
      src/views/allocationManagement/chainTransferIn/edit.vue
  27. 32 37
      src/views/allocationManagement/chainTransferIn/list.vue
  28. 57 56
      src/views/allocationManagement/chainTransferOut/detail.vue
  29. 172 155
      src/views/allocationManagement/chainTransferOut/edit.vue
  30. 43 47
      src/views/allocationManagement/chainTransferOut/list.vue
  31. 59 58
      src/views/allocationManagement/storeTransferOut/detail.vue
  32. 164 147
      src/views/allocationManagement/storeTransferOut/edit.vue
  33. 41 45
      src/views/allocationManagement/storeTransferOut/list.vue
  34. 72 71
      src/views/allocationManagement/warehouseAllocation/detail.vue
  35. 176 158
      src/views/allocationManagement/warehouseAllocation/edit.vue
  36. 39 44
      src/views/allocationManagement/warehouseAllocation/list.vue
  37. 1 1
      src/views/basicData/bulkPartsTypeManagement/list.vue
  38. 1 1
      src/views/basicData/customerTypeManagement/list.vue
  39. 1 1
      src/views/basicData/expenseType/list.vue
  40. 1 1
      src/views/basicData/processSettings/setup.vue
  41. 1 1
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  42. 3 3
      src/views/bulkManagement/bulkReturnGoods/edit.vue
  43. 1 1
      src/views/bulkManagement/bulkReturnGoods/list.vue
  44. 3 3
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  45. 3 3
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  46. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  47. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/warehousing.vue
  48. 1 1
      src/views/customerManagement/customerInfo/edit.vue
  49. 1 1
      src/views/customerManagement/customerInfo/list.vue
  50. 2 2
      src/views/financialManagement/companyCollectionPayment/detail.vue
  51. 1 1
      src/views/financialManagement/companyCollectionPayment/list.vue
  52. 1 1
      src/views/financialManagement/companyReceivablePayable/list.vue
  53. 2 2
      src/views/financialManagement/companyReceivablePayable/paymentSlip.vue
  54. 2 2
      src/views/financialManagement/companyReceivablePayable/receipt.vue
  55. 1 1
      src/views/financialManagement/expenseManagement/edit.vue
  56. 1 1
      src/views/financialManagement/expenseManagement/list.vue
  57. 1 1
      src/views/financialManagement/financialCollection/list.vue
  58. 1 1
      src/views/financialManagement/financialPayment/list.vue
  59. 2 2
      src/views/financialManagement/inventoryReview/detail.vue
  60. 1 1
      src/views/financialManagement/inventoryReview/list.vue
  61. 1 1
      src/views/financialManagement/ledgerRecord/list.vue
  62. 2 2
      src/views/financialManagement/warehousingAudit/detail.vue
  63. 1 1
      src/views/financialManagement/warehousingAudit/list.vue
  64. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  65. 14 14
      src/views/inventoryManagement/inventoryChecking/checkingTipsModal.vue
  66. 142 106
      src/views/inventoryManagement/inventoryChecking/detail.vue
  67. 2 2
      src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue
  68. 48 49
      src/views/inventoryManagement/inventoryChecking/list.vue
  69. 101 100
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  70. 2 2
      src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue
  71. 46 39
      src/views/inventoryManagement/inventoryChecking/overall.vue
  72. 182 150
      src/views/inventoryManagement/inventoryChecking/selfDisk.vue
  73. 0 148
      src/views/inventoryManagement/inventoryChecking/supervisionAudit.vue
  74. 0 144
      src/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue
  75. 18 19
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  76. 15 23
      src/views/inventoryManagement/inventoryQuery/list.vue
  77. 30 34
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  78. 42 41
      src/views/inventoryManagement/inventoryWarning/list.vue
  79. 55 38
      src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue
  80. 161 156
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  81. 9 11
      src/views/inventoryManagement/warehouse/list.vue
  82. 7 6
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  83. 1 1
      src/views/power/OperateJournal/OperateJournal.vue
  84. 1 1
      src/views/power/dataDictionary/dataDictionary.vue
  85. 1 1
      src/views/power/register/register.vue
  86. 1 1
      src/views/power/role/roleList.vue
  87. 1 1
      src/views/power/user/userList.vue
  88. 1 1
      src/views/productManagement/productBrand/list.vue
  89. 1 1
      src/views/productManagement/productCategory/list.vue
  90. 1 1
      src/views/productManagement/productInfo/edit.vue
  91. 1 1
      src/views/productManagement/productInfo/list.vue
  92. 68 67
      src/views/purchasingManagement/purchaseOrder/detail.vue
  93. 165 147
      src/views/purchasingManagement/purchaseOrder/edit.vue
  94. 58 41
      src/views/purchasingManagement/purchaseOrder/list.vue
  95. 114 110
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  96. 94 97
      src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue
  97. 87 79
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  98. 1 1
      src/views/result/Error.vue
  99. 1 1
      src/views/result/Success.vue
  100. 2 2
      src/views/salesManagement/backorder/detail.vue

+ 2 - 2
src/api/allocLinkageOut.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  连锁调拨调出列表  分页
 export const allocLinkageOutList = (params) => {
-  const url = `/allocLinkageOut/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocLinkageOut/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const allocLinkageOutList = (params) => {
 }
 //  连锁调拨调出详情列表  分页
 export const allocLinkageOutDetailList = (params) => {
-  const url = `/allocLinkageOut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocLinkageOut/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 2 - 2
src/api/allocLinkagePut.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  连锁调拨调入列表  分页
 export const allocLinkagePutList = (params) => {
-  const url = `/allocLinkagePut/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocLinkagePut/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const allocLinkagePutList = (params) => {
 }
 //  连锁调拨调入详情列表  分页
 export const allocLinkagePutDetailList = (params) => {
-  const url = `/allocLinkagePut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocLinkagePut/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 2 - 2
src/api/allocWarehouse.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  仓库调拨列表  分页
 export const allocWarehouseList = (params) => {
-  const url = `/allocWarehouse/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocWarehouse/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const allocWarehouseList = (params) => {
 }
 //  仓库调拨详情列表  分页
 export const allocWarehouseDetailList = (params) => {
-  const url = `/allocWarehouse/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/allocWarehouse/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/custType.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  客户类型列表  分页
 export const custTypeList = (params) => {
-  const url = `/custType/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/custType/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/customer.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  客户列表  分页
 export const custList = (params) => {
-  const url = `/cust/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/cust/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 3 - 18
src/api/data.js

@@ -104,25 +104,10 @@ function randomStr (len) {
   return pwd
 }
 
-// 查询省
-export const getProvince = () => {
+// 查询省/市/区
+export const getArea = (params) => {
   return axios({
-    url: `/area/findProvince`,
-    method: 'post'
-  })
-}
-// 查询市
-export const getCityByPro = params => {
-  return axios({
-    url: `/area/findCity/${params.id}`,
-    data: params,
-    method: 'post'
-  })
-}
-// 查询区
-export const getDistrictByCity = params => {
-  return axios({
-    url: `/area/findDistrict/${params.id}`,
+    url: `/area/queryList`,
     data: params,
     method: 'post'
   })

+ 12 - 1
src/api/dealerProduct.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  产品列表  分页
 export const dealerProductList = (params) => {
-  const url = `/dealerProduct/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/dealerProduct/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -58,3 +58,14 @@ export const dealerProductDetail = (params) => {
     method: 'get'
   })
 }
+//  赠品 列表  分页
+export const giftsDetailList = (params) => {
+  const url = `/giftsDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 1 - 1
src/api/dealerProductBrand.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  产品品牌列表  分页
 export const dealerProductBrandList = (params) => {
-  const url = `/dealerProductBrand/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/dealerProductBrand/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/giftsDetail.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  赠品详情列表  分页
 export const giftsDetailList = (params) => {
-  const url = `/giftsDetail/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/giftsDetail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 77 - 0
src/api/purchase.js

@@ -0,0 +1,77 @@
+import { axios } from '@/utils/request'
+
+//  采购 列表  有分页
+export const purchaseList = (params) => {
+  const url = `/purchase/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 打印
+export const purchasePrint = (params) => {
+  return axios({
+    url: '/purchase/print',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 打印预览
+export const purchasePrintPreview = (params) => {
+  return axios({
+    url: '/purchase/printPreview',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 付款
+export const purchaseWritePay = (params) => {
+  return axios({
+    url: '/purchase/pay',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 入库
+export const purchaseWriteStockIn = (params) => {
+  return axios({
+    url: '/purchase/stockIn',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 提交
+export const purchaseWriteSubmit = (params) => {
+  return axios({
+    url: '/purchase/submit',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 保存
+export const purchaseSave = (params) => {
+  return axios({
+    url: '/purchase/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 删除
+export const purchaseDel = (params) => {
+  return axios({
+    url: `/purchase/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购 导出
+export const purchaseExport = (params) => {
+  return axios({
+    url: '/purchase/export',
+    data: params,
+    method: 'post'
+  })
+}

+ 37 - 0
src/api/purchaseDetail.js

@@ -0,0 +1,37 @@
+import { axios } from '@/utils/request'
+
+//  采购详情 列表  分页
+export const purchaseDetailList = (params) => {
+  const url = `/purchaseDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购详情 保存
+export const purchaseDetailSave = (params) => {
+  return axios({
+    url: '/purchaseDetail/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购详情 删除
+export const purchaseDetailDel = (params) => {
+  return axios({
+    url: `/purchaseDetail/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购详情 整单删除
+export const purchaseDetailDelAll = (params) => {
+  return axios({
+    url: `/purchaseDetail/deleteAll/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 77 - 0
src/api/purchaseRerurn.js

@@ -0,0 +1,77 @@
+import { axios } from '@/utils/request'
+
+//  采购退货 列表  分页
+export const purchaseRerurnList = (params) => {
+  const url = `/purchaseRerurn/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 导出
+export const purchaseRerurnExport = (params) => {
+  return axios({
+    url: '/purchaseRerurn/export',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 审核
+export const purchaseRerurnAudit = (params) => {
+  return axios({
+    url: '/purchaseRerurn/audit',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 收款
+export const purchaseRerurnPay = (params) => {
+  return axios({
+    url: '/purchaseRerurn/pay',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 打印
+export const purchaseRerurnPrint = (params) => {
+  return axios({
+    url: '/purchaseRerurn/print',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 打印预览
+export const purchaseRerurnprintPreview = (params) => {
+  return axios({
+    url: '/purchaseRerurn/printPreview',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 提交
+export const purchaseRerurnSubmit = (params) => {
+  return axios({
+    url: '/purchaseRerurn/submit',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 保存
+export const purchaseRerurnSave = (params) => {
+  return axios({
+    url: '/purchaseRerurn/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货 删除
+export const purchaseRerurnDel = (params) => {
+  return axios({
+    url: `/purchaseRerurn/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 29 - 0
src/api/purchaseRerurnDetail.js

@@ -0,0 +1,29 @@
+import { axios } from '@/utils/request'
+
+//  采购退货详情 列表  分页
+export const purchaseRerurnDetailList = (params) => {
+  const url = `/purchaseRerurnDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货详情 保存
+export const purchaseRerurnDetailSave = (params) => {
+  return axios({
+    url: '/purchaseRerurnDetail/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  采购退货详情 删除
+export const purchaseRerurnDetailDel = (params) => {
+  return axios({
+    url: `/purchaseRerurnDetail/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 65 - 1
src/api/sales.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  销售 列表  有分页
 export const salesList = (params) => {
-  const url = `/sales/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sales/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -35,3 +35,67 @@ export const salesWriteDown = (params) => {
     method: 'post'
   })
 }
+//  销售 审核
+export const salesWriteAudit = (params) => {
+  return axios({
+    url: '/sales/audit',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 折扣
+export const salesWriteDiscount = (params) => {
+  return axios({
+    url: '/sales/discount',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 备货审核
+export const salesWritePrepareAudit = (params) => {
+  return axios({
+    url: '/sales/prepareAudit',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 收款
+export const salesWriteReceipt = (params) => {
+  return axios({
+    url: '/sales/receipt',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 出库
+export const salesWriteStockOut = (params) => {
+  return axios({
+    url: '/sales/stockOut',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 提交
+export const salesWriteSubmit = (params) => {
+  return axios({
+    url: '/sales/submit',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 保存
+export const salesSave = (params) => {
+  return axios({
+    url: '/sales/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 删除
+export const salesDel = (params) => {
+  return axios({
+    url: `/sales/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 37 - 0
src/api/salesDetail.js

@@ -0,0 +1,37 @@
+import { axios } from '@/utils/request'
+
+//  销售详情 列表  分页
+export const salesDetailList = (params) => {
+  const url = `/salesDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  销售详情 保存
+export const salesDetailSave = (params) => {
+  return axios({
+    url: '/salesDetail/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售详情 删除
+export const salesDetailDel = (params) => {
+  return axios({
+    url: `/salesDetail/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}
+//  销售详情 整单删除
+export const salesDetailDelAll = (params) => {
+  return axios({
+    url: `/salesDetail/deleteAll/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 77 - 0
src/api/salesRerurn.js

@@ -0,0 +1,77 @@
+import { axios } from '@/utils/request'
+
+//  销售退货 列表  分页
+export const salesRerurnList = (params) => {
+  const url = `/salesRerurn/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 导出
+export const salesRerurnExport = (params) => {
+  return axios({
+    url: '/salesRerurn/export',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 审核
+export const salesRerurnAudit = (params) => {
+  return axios({
+    url: '/salesRerurn/audit',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 收款
+export const salesRerurnPay = (params) => {
+  return axios({
+    url: '/salesRerurn/pay',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 打印
+export const salesRerurnPrint = (params) => {
+  return axios({
+    url: '/salesRerurn/print',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 打印预览
+export const salesRerurnprintPreview = (params) => {
+  return axios({
+    url: '/salesRerurn/printPreview',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 提交
+export const salesRerurnSubmit = (params) => {
+  return axios({
+    url: '/salesRerurn/submit',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 保存
+export const salesRerurnSave = (params) => {
+  return axios({
+    url: '/salesRerurn/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货 删除
+export const salesRerurnDel = (params) => {
+  return axios({
+    url: `/salesRerurn/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 29 - 0
src/api/salesRerurnDetail.js

@@ -0,0 +1,29 @@
+import { axios } from '@/utils/request'
+
+//  销售退货详情 列表  分页
+export const salesRerurnDetailList = (params) => {
+  const url = `/salesRerurnDetail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货详情 保存
+export const salesRerurnDetailSave = (params) => {
+  return axios({
+    url: '/salesRerurnDetail/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售退货详情 删除
+export const salesRerurnDetailDel = (params) => {
+  return axios({
+    url: `/salesRerurnDetail/delete/${params.id}`,
+    data: params,
+    method: 'post'
+  })
+}

+ 2 - 2
src/api/stock.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  库存列表  分页
 export const stockList = (params) => {
-  const url = `/stock/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/stock/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const stockList = (params) => {
 }
 //  库存详情列表  分页
 export const stockDetailList = (params) => {
-  const url = `/stock/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/stock/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 2 - 2
src/api/storeCallOut.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  店内调出列表  分页
 export const storeCallOutList = (params) => {
-  const url = `/storeCallOut/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/storeCallOut/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const storeCallOutList = (params) => {
 }
 //  店内调出详情列表  分页
 export const storeCallOutDetailList = (params) => {
-  const url = `/storeCallOut/findDetailPage/${params.pageNo}/${params.pageSize}`
+  const url = `/storeCallOut/queryDetailPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/urgent.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  急件列表  有分页
 export const urgentList = (params) => {
-  const url = `/urgent/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/urgent/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 1 - 1
src/api/urgentDetail.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  急件详情列表  有分页
 export const urgentDetailList = (params) => {
-  const url = `/urgentDetail/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/urgentDetail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 5 - 7
src/api/warehouse.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  仓库列表  有分页
 export const warehouseList = (params) => {
-  let url = `/warehouse/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/warehouse/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -13,7 +13,7 @@ export const warehouseList = (params) => {
 }
 //  仓库列表  无分页
 export const warehouseFindAll = (params) => {
-  let url = '/warehouse/findAll'
+  const url = '/warehouse/findAll'
   return axios({
     url: url,
     data: params,
@@ -36,11 +36,9 @@ export const warehouseDel = params => {
   })
 }
 
-
-
 //  仓位列表  有分页
 export const warehouseLocList = (params) => {
-  let url = `/warehouseLoc/findPage/${params.pageNo}/${params.pageSize}`
+  const url = `/warehouseLoc/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -51,7 +49,7 @@ export const warehouseLocList = (params) => {
 }
 //  仓位列表  无分页
 export const warehouseLocFindAll = (params) => {
-  let url = '/warehouseLoc/findAll'
+  const url = '/warehouseLoc/findAll'
   return axios({
     url: url,
     data: params,
@@ -75,4 +73,4 @@ export const warehouseLocDel = params => {
     data: params,
     method: 'post'
   })
-}
+}

+ 60 - 82
src/config/router.config.js

@@ -85,31 +85,31 @@ export const asyncRouterMap = [
               {
                 path: 'detail/:id',
                 name: 'salesDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/salesDetail.vue'),
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
                 meta: {
-                  title: '销售单明细',
+                  title: '销售单详情',
                   icon: 'monitor',
                   hidden: true
                   // permission: 'M_salesDetail'
                 }
               },
               {
-                path: 'salesNew',
-                name: 'salesNew',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/salesNew.vue'),
+                path: 'add',
+                name: 'salesAdd',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
                 meta: {
-                  title: '新销售单',
+                  title: '新销售单',
                   icon: 'monitor',
                   hidden: true
                   // permission: 'M_salesNew'
                 }
               },
               {
-                path: 'salesEdit/:id',
+                path: 'edit/:id',
                 name: 'salesEdit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/salesNew.vue'),
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
                 meta: {
-                  title: '修改销售单',
+                  title: '编辑销售单',
                   icon: 'monitor',
                   hidden: true
                   // permission: 'M_salesNew'
@@ -166,7 +166,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/salesManagement/urgentItemsOffset/list',
+                path: 'list',
                 name: 'urgentItemsOffsetList',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/list.vue'),
                 meta: {
@@ -177,7 +177,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/salesManagement/urgentItemsOffset/detail/:id',
+                path: 'detail/:id',
                 name: 'urgentItemsOffsetDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/detail.vue'),
                 meta: {
@@ -428,7 +428,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/purchasingManagement/purchaseOrder/list',
+                path: 'list',
                 name: 'purchaseOrderList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/list.vue'),
                 meta: {
@@ -439,7 +439,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/add',
+                path: 'add',
                 name: 'purchaseOrderAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
                 meta: {
@@ -450,7 +450,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/edit/:id',
+                path: 'edit/:id',
                 name: 'purchaseOrderEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
                 meta: {
@@ -461,7 +461,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/detail/:id',
+                path: 'detail/:id',
                 name: 'purchaseOrderDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/detail.vue'),
                 meta: {
@@ -472,7 +472,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/warehousing/:id',
+                path: 'warehousing/:id',
                 name: 'purchaseOrderWarehousing',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/warehousing.vue'),
                 meta: {
@@ -510,7 +510,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/allocationManagement/warehouseAllocation/list',
+                path: 'list',
                 name: 'warehouseAllocationList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/list.vue'),
                 meta: {
@@ -521,7 +521,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/warehouseAllocation/add',
+                path: 'add',
                 name: 'warehouseAllocationAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/edit.vue'),
                 meta: {
@@ -532,7 +532,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/warehouseAllocation/edit/:id',
+                path: 'edit/:id',
                 name: 'warehouseAllocationEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/edit.vue'),
                 meta: {
@@ -543,7 +543,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/warehouseAllocation/detail/:id/:sn',
+                path: 'detail/:id/:sn',
                 name: 'warehouseAllocationDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/warehouseAllocation/detail.vue'),
                 meta: {
@@ -568,7 +568,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/allocationManagement/chainTransferIn/list',
+                path: 'list',
                 name: 'chainTransferInList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/list.vue'),
                 meta: {
@@ -579,7 +579,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferIn/add',
+                path: 'add',
                 name: 'chainTransferInAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/edit.vue'),
                 meta: {
@@ -590,7 +590,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferIn/edit/:id',
+                path: 'edit/:id',
                 name: 'chainTransferInEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/edit.vue'),
                 meta: {
@@ -601,7 +601,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferIn/detail/:id/:sn',
+                path: 'detail/:id/:sn',
                 name: 'chainTransferInDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferIn/detail.vue'),
                 meta: {
@@ -626,7 +626,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/allocationManagement/chainTransferOut/list',
+                path: 'list',
                 name: 'chainTransferOutList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/list.vue'),
                 meta: {
@@ -637,7 +637,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferOut/add',
+                path: 'add',
                 name: 'chainTransferOutAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/edit.vue'),
                 meta: {
@@ -648,7 +648,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferOut/edit/:id',
+                path: 'edit/:id',
                 name: 'chainTransferOutEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/edit.vue'),
                 meta: {
@@ -659,7 +659,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/chainTransferOut/detail/:id/:sn',
+                path: 'detail/:id/:sn',
                 name: 'chainTransferOutDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/chainTransferOut/detail.vue'),
                 meta: {
@@ -684,7 +684,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/allocationManagement/storeTransferOut/list',
+                path: 'list',
                 name: 'storeTransferOutList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/list.vue'),
                 meta: {
@@ -695,7 +695,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/storeTransferOut/add',
+                path: 'add',
                 name: 'storeTransferOutAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/edit.vue'),
                 meta: {
@@ -706,7 +706,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/storeTransferOut/edit/:id',
+                path: 'edit/:id',
                 name: 'storeTransferOutEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/edit.vue'),
                 meta: {
@@ -717,7 +717,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/allocationManagement/storeTransferOut/detail/:id/:sn',
+                path: 'detail/:id/:sn',
                 name: 'storeTransferOutDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/allocationManagement/storeTransferOut/detail.vue'),
                 meta: {
@@ -912,28 +912,6 @@ export const asyncRouterMap = [
                   // permission: 'B_goodsManage_edit'
                 }
               },
-              {
-                path: 'supervisionAudit/:id',
-                name: 'inventoryCheckingSupervisionAudit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAudit.vue'),
-                meta: {
-                  title: '监盘审核',
-                  icon: 'reconciliation',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'supervisionAudit/detail/:id', /* 监盘审核详情  */
-                name: 'inventoryCheckingSupervisionAuditDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue'),
-                meta: {
-                  title: '库存盘点详情',
-                  icon: 'reconciliation',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
               {
                 path: 'financialAudit/detail/:id', /* 财务审核详情  */
                 name: 'inventoryCheckingFinancialAuditDetail',
@@ -973,7 +951,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/customerManagement/customerInfo/list',
+                path: 'list',
                 name: 'customerInfoList',
                 component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/list.vue'),
                 meta: {
@@ -984,7 +962,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/customerManagement/customerInfo/add',
+                path: 'add',
                 name: 'customerInfoAdd',
                 component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
                 meta: {
@@ -995,7 +973,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/customerManagement/customerInfo/edit/:id',
+                path: 'edit/:id',
                 name: 'customerInfoEdit',
                 component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
                 meta: {
@@ -1033,7 +1011,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/productManagement/productInfo/list',
+                path: 'list',
                 name: 'productInfoList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/productManagement/productInfo/list.vue'),
                 meta: {
@@ -1044,7 +1022,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/productManagement/productInfo/add',
+                path: 'add',
                 name: 'productInfoAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/productManagement/productInfo/edit.vue'),
                 meta: {
@@ -1055,7 +1033,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/productManagement/productInfo/edit/:id',
+                path: 'edit/:id',
                 name: 'productInfoEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/productManagement/productInfo/edit.vue'),
                 meta: {
@@ -1080,7 +1058,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/productManagement/productBrand/list',
+                path: 'list',
                 name: 'productBrandList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/productManagement/productBrand/list.vue'),
                 meta: {
@@ -1105,7 +1083,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/productManagement/productCategory/list',
+                path: 'list',
                 name: 'productCategoryList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/productManagement/productCategory/list.vue'),
                 meta: {
@@ -1143,7 +1121,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/supplierManagement/supplierInfo/list',
+                path: 'list',
                 name: 'supplierInfoList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/list.vue'),
                 meta: {
@@ -1154,7 +1132,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/supplierManagement/supplierInfo/add',
+                path: 'add',
                 name: 'supplierInfoAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
@@ -1165,7 +1143,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/supplierManagement/supplierInfo/edit/:id',
+                path: 'edit/:id',
                 name: 'supplierInfoEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
@@ -1203,7 +1181,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/bulkManagement/bulkWarehousingOrder/list',
+                path: 'list',
                 name: 'bulkWarehousingOrderList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
                 meta: {
@@ -1214,7 +1192,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/add',
+                path: 'add',
                 name: 'bulkWarehousingOrderAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {
@@ -1225,7 +1203,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/edit/:id',
+                path: 'edit/:id',
                 name: 'bulkWarehousingOrderEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
                 meta: {
@@ -1236,7 +1214,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/detail/:id',
+                path: 'detail/:id',
                 name: 'bulkWarehousingOrderDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
                 meta: {
@@ -1247,7 +1225,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/warehousing/:id',
+                path: 'warehousing/:id',
                 name: 'bulkWarehousingOrderWarehousing',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/warehousing.vue'),
                 meta: {
@@ -1266,51 +1244,51 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '散件退货',
-              icon: 'gold'
+              icon: 'frown'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/bulkManagement/bulkReturnGoods/list',
+                path: 'list',
                 name: 'bulkReturnGoodsList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/list.vue'),
                 meta: {
                   title: '散件退货列表',
-                  icon: 'gold',
+                  icon: 'frown',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/bulkManagement/bulkReturnGoods/add',
+                path: 'add',
                 name: 'bulkReturnGoodsAdd',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
                 meta: {
                   title: '新增散件退货单',
-                  icon: 'gold',
+                  icon: 'frown',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/bulkManagement/bulkReturnGoods/edit/:id',
+                path: 'edit/:id',
                 name: 'bulkReturnGoodsEdit',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
                 meta: {
                   title: '编辑散件退货单',
-                  icon: 'gold',
+                  icon: 'frown',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/bulkManagement/bulkReturnGoods/detail/:id',
+                path: 'detail/:id',
                 name: 'bulkReturnGoodsDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/detail.vue'),
                 meta: {
                   title: '散件退货单详情',
-                  icon: 'gold',
+                  icon: 'frown',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
@@ -1669,7 +1647,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/basicData/storeTransferOutTypeManagement/list',
+                path: 'list',
                 name: 'storeTransferOutTypeManagementList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/storeTransferOutTypeManagement/list.vue'),
                 meta: {
@@ -1694,7 +1672,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/basicData/bulkPartsTypeManagement/list',
+                path: 'list',
                 name: 'bulkPartsTypeManagementList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/bulkPartsTypeManagement/list.vue'),
                 meta: {
@@ -1769,7 +1747,7 @@ export const asyncRouterMap = [
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/basicData/customerTypeManagement/list',
+                path: 'list',
                 name: 'customerTypeManagementList',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/customerTypeManagement/list.vue'),
                 meta: {

+ 5 - 0
src/libs/tools.js

@@ -0,0 +1,5 @@
+// 小数运算精度处理  4位小数运算后结果保留2位小数
+export const getOperationalPrecision = (num1, num2) => {
+  const val = ((num1 * 10000) * (num2 * 10000) / 100000000).toFixed(2) || 0
+  return val == 0 ? 0 : val
+}

+ 49 - 48
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -15,7 +15,7 @@
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
     </a-alert>
-    <a-card :bordered="false" class="chainTransferInDetail-cont">
+    <a-card size="small" :bordered="false" class="chainTransferInDetail-cont">
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -24,10 +24,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1275 }"
         bordered>
         <!-- 成本小计 -->
-        <template slot="costSubtotal" slot-scope="text, record">
-          <span>{{(record.putCost * record.putQty) || 0}}</span>
+        <template slot="totalCost" slot-scope="text, record">
+          <span>{{ (record.putCost * record.putQty) || 0 }}</span>
         </template>
       </s-table>
     </a-card>
@@ -35,53 +36,53 @@
 </template>
 
 <script>
-	import { allocLinkagePutDetailList } from '@/api/allocLinkagePut'
-	import { STable, VSelect } from '@/components'
-	export default{
-		components: { STable, VSelect },
-		data(){
-		  return{
-			queryParam: {
-				allocationLinkagePutSn: this.$route.params.sn
-			},
-			disabled: false, //  查询、重置按钮是否可操作
-			brandData: [],  //  产品品牌  下拉数据
-			typeData: [],  //  产品类别  下拉数据
-			// 表头
-			columns: [
-				{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-				{ title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-				{ title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '成本价', dataIndex: 'putCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-				{ title: '调入数量', dataIndex: 'putQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-				{ title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '成本小计', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
-				{ title: '仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '仓位', dataIndex: 'warehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } }
-			],
-			// 加载数据方法 必须为 Promise 对象
-			loadData: parameter => {
-				this.disabled = true
-				return allocLinkagePutDetailList( Object.assign(parameter, this.queryParam) ).then(res => {
-					const data = res.data
-					const no = (data.pageNo - 1) * data.pageSize
-					for (var i = 0; i < data.list.length; i++) {
-						data.list[i].no = no + i + 1
-					}
-					this.disabled = false
-					return data
-				})
-			},
+import { allocLinkagePutDetailList } from '@/api/allocLinkagePut'
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+        allocationLinkagePutSn: this.$route.params.sn
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调入数量', dataIndex: 'putQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: 135, align: 'center' },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        return allocLinkagePutDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.disabled = false
+          return data
+        })
+      }
 		  }
-		},
-		methods: {
+  },
+  methods: {
 		  //  返回列表
-		  handleBack(){
-        this.$router.push({ path: '/allocationManagement/chainTransferIn/list'})
-		  },
-		}
-	}
+		  handleBack () {
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
+		  }
+  }
+}
 </script>
 
 <style lang="less">

+ 75 - 79
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -15,7 +15,7 @@
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
     </a-alert>
-    <a-card :bordered="false" class="chainTransferInEdit-cont">
+    <a-card size="small" :bordered="false" class="chainTransferInEdit-cont">
       <!-- 筛选条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -50,23 +50,20 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1255 }"
         bordered>
         <!-- 调入仓库 -->
         <template slot="warehouse" slot-scope="text, record">
-          <a-select id="chainTransferInEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse">
+          <a-select id="chainTransferInEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse" style="width: 100%;">
             <a-select-option v-for="item in typeData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
         </template>
         <!-- 调入仓位 -->
         <template slot="warehouseLoc" slot-scope="text, record">
-          <a-select id="chainTransferInEdit-warehouseLoc" placeholder="请选择" allowClear v-model="record.warehouseLoc">
+          <a-select id="chainTransferInEdit-warehouseLoc" placeholder="请选择" allowClear v-model="record.warehouseLoc" style="width: 100%;">
             <a-select-option v-for="item in typeData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
         </template>
-        <!-- 操作 -->
-        <!-- <template slot="action" slot-scope="text, record">
-          <a-button type="primary" @click="handleAdd(record)" id="chainTransferInEdit-add-btn">添加</a-button>
-        </template> -->
       </s-table>
     </a-card>
     <a-affix :offset-bottom="0">
@@ -78,82 +75,81 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        disabled: false, //  查询、重置按钮是否可操作
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'custsN2agme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调入数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本小计', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '仓库', scopedSlots: { customRender: 'warehouse' }, align: 'center' },
-          { title: '仓位', scopedSlots: { customRender: 'warehouseLoc' }, align: 'center' },
-          // { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'custsN2agme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调入数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计(¥)', dataIndex: 'custsNagme', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', scopedSlots: { customRender: 'warehouse' }, width: 140, align: 'center' },
+        { title: '仓位', scopedSlots: { customRender: 'warehouseLoc' }, width: 140, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       }
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
     },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  提交
-      handleSubmit(){},
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/chainTransferIn/list'})
-      },
+    //  提交
+    handleSubmit () {},
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/chainTransferIn/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 32 - 37
src/views/allocationManagement/chainTransferIn/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="chainTransferInList-wrap">
+  <a-card size="small" :bordered="false" class="chainTransferInList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -7,13 +7,13 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="入库时间">
               <a-range-picker
-                  style="width:100%"
-                  id="chainTransferInList-time"
-                  :disabledDate="disabledDate"
-                  v-model="time"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
-              </a-form-item>
+                style="width:100%"
+                id="chainTransferInList-time"
+                :disabledDate="disabledDate"
+                v-model="time"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -70,17 +70,21 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1595 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span :class="record.state==1?'green':'red'"> {{ record.state==1? '待入库': '待审核' }} </span>
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待入库': '待审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
-        <a-button size="small" @click="handleExamine(record)" id="chainTransferInList-examine-btn" style="margin: 0 0 10px 8px;">审核</a-button>
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="chainTransferInList-edit-btn" style="margin: 0 0 0 8px;">编辑</a-button>
-        <a-button size="small" @click="handleDetail(record)" id="chainTransferInList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
+        <a-button size="small" type="link" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleExamine(record)" id="chainTransferInList-examine-btn">审核</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="chainTransferInList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="chainTransferInList-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -94,32 +98,33 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
-      time: undefined,  //  入库时间
+      time: undefined, //  入库时间
       queryParam: { //  查询条件
         outTenantName: undefined, //  调出对象
         allocationType: undefined, //  调拨产品类型
-        state: undefined, //  单据状态
+        state: undefined //  单据状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 },
-        { title: '连锁调出单号', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '店内单号', dataIndex: 'allocationLinkagePutNo', width: 160, align: 'center', ellipsis: true },
-        { title: '调出对象', dataIndex: 'outTenantName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'putWarehouseTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨产品类型', dataIndex: 'allocationType', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '连锁调出单号', dataIndex: 'productName', width: 140, align: 'center' },
+        { title: '店内单号', dataIndex: 'allocationLinkagePutNo', width: 140, align: 'center' },
+        { title: '调出对象', dataIndex: 'outTenantName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库时间', dataIndex: 'putWarehouseTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨产品类型', dataIndex: 'allocationType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 215, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.queryParam = {}
-        return allocLinkagePutList( Object.assign(parameter, this.queryParam) ).then(res => {
+        return allocLinkagePutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -185,13 +190,3 @@ export default {
   }
 }
 </script>
-
-<style lang="less">
-  .chainTransferInList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

+ 57 - 56
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -15,7 +15,7 @@
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">审核状态: <strong>支持市级</strong>,完结状态: <strong>支持市级</strong>,调出对象: <strong>支持市级</strong>,调入单号: <strong>2121212</strong>,总成本:¥<strong>6.33</strong>,总数量: <strong>6</strong> </div>
     </a-alert>
-    <a-card :bordered="false" class="chainTransferOutDetail-cont">
+    <a-card size="small" :bordered="false" class="chainTransferOutDetail-cont">
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -24,10 +24,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1085 }"
         bordered>
         <!-- 成本小计 -->
-        <template slot="costSubtotal" slot-scope="text, record">
-          <span>{{(record.outCost * record.outQty) || 0}}</span>
+        <template slot="totalCost" slot-scope="text, record">
+          <span>{{ (record.outCost * record.outQty) || 0 }}</span>
         </template>
       </s-table>
     </a-card>
@@ -35,63 +36,63 @@
 </template>
 
 <script>
-  import { allocLinkageOutDetailList } from '@/api/allocLinkageOut'
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          allocationLinkageOutSn: this.$route.params.sn
-        },
-        disabled: false, //  查询、重置按钮是否可操作
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'outCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调出仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', dataIndex: 'outQty', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '成本小计(¥)', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          return allocLinkageOutDetailList( Object.assign(parameter, this.queryParam) ).then(res => {
-            const data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            this.disabled = false
-            return data
-          })
-        },
+import { allocLinkageOutDetailList } from '@/api/allocLinkageOut'
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+        allocationLinkageOutSn: this.$route.params.sn
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', dataIndex: 'outQty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: 135, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        return allocLinkageOutDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.disabled = false
+          return data
+        })
       }
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
     },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  提交
-      handleSubmit(){},
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/chainTransferOut/list'})
-      },
+    //  提交
+    handleSubmit () {},
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 172 - 155
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -12,12 +12,19 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="chainTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="chainTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
             基础信息
-            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="chainTransferOutEdit-circle-btn" @click.stop="handleEditInfo" />
+            <a-button
+              type="primary"
+              shape="circle"
+              size="small"
+              icon="edit"
+              class="edit-circle-btn"
+              id="chainTransferOutEdit-circle-btn"
+              @click.stop="handleEditInfo" />
           </template>
           <a-descriptions :column="3">
             <a-descriptions-item label="调往对象">箭冠营销中心</a-descriptions-item>
@@ -26,7 +33,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="chainTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="chainTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="选择产品">
           <!-- 筛选条件 -->
@@ -51,7 +58,14 @@
                 <template v-if="advanced">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品品牌">
-                      <a-select placeholder="请选择" id="chainTransferOutEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                      <a-select
+                        placeholder="请选择"
+                        id="chainTransferOutEdit-state"
+                        allowClear
+                        v-model="queryParam.dataSourceNo"
+                        :showSearch="true"
+                        option-filter-prop="children"
+                        :filter-option="filterOption">
                         <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -92,6 +106,7 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1530 }"
             bordered>
             <!-- 调出数量 -->
             <template slot="transferOutQuantity" slot-scope="text, record">
@@ -105,14 +120,14 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="primary" @click="handleAdd(record)" id="chainTransferOutEdit-add-btn">添加</a-button>
+              <a-button size="small" type="link" @click="handleAdd(record)" id="chainTransferOutEdit-add-btn">添加</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="chainTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="chainTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="已选产品">
           <!-- 总计 -->
@@ -121,16 +136,16 @@
           </a-alert>
           <!-- 筛选条件 -->
           <a-row :gutter="15" justify="space-between">
-            <a-col :span="18">
+            <a-col :span="17">
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                   <a-row :gutter="15">
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品编码" prop="name">
                         <a-input id="chainTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
                       </a-form-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品名称" prop="name">
                         <a-input id="chainTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
                       </a-form-item>
@@ -143,9 +158,9 @@
                 </a-form>
               </div>
             </a-col>
-            <a-col :span="6">
-              <a-button style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button>
-              <a-button type="danger" style="margin-left: 8px" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+            <a-col :span="7">
+              <a-button size="small" style="margin-left: 8px" id="chainTransferOutEdit-import-btn">导入明细</a-button>
+              <a-button size="small" type="danger" style="margin-left: 8px" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
             </a-col>
           </a-row>
           <!-- 列表 -->
@@ -156,6 +171,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :data="chooseLoadData"
+            :scroll="{ x: 1545 }"
             bordered>
             <!-- 调出数量 -->
             <template slot="transferOutQuantity" slot-scope="text, record">
@@ -169,7 +185,7 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="danger" @click="handleDel(record)" id="chainTransferOutEdit-del-btn">删除</a-button>
+              <a-button size="small" type="link" @click="handleDel(record)" id="chainTransferOutEdit-del-btn">删除</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -186,156 +202,157 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import basicInfoModal from './basicInfoModal.vue'
-  export default{
-    components: { STable, VSelect, basicInfoModal },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        disabled: false, //  查询、重置按钮是否可操作
-        advanced: false,  // 高级搜索 展开/关闭
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '品牌', dataIndex: 'custsNsame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'custsNdame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'custsNafme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'storageQuantity', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '库存数量', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '品牌', dataIndex: 'custsNsame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'custsNdame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'custsNafme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'storageQuantity', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '成本小计', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  基本信息  保存
-      handleOk(){
-        
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      queryParam: {
+
       },
-      //  提交
-      handleSubmit(){},
-      //  导入明细
-      handleImport(){
-        console.log(333)
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      disabled: false, //  查询、重置按钮是否可操作
+      advanced: false, // 高级搜索 展开/关闭
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center' },
+        { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'custsNsame', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'custsNdame', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'custsNafme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'storageQuantity', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'custsNagme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 150, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/chainTransferOut/list'})
+      // 表头
+      chooseColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'custsNsame', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'custsNdame', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'custsNafme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'storageQuantity', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 150, align: 'center' },
+        { title: '成本小计(¥)', dataIndex: 'custsNagme', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      filterOption(input, option) {
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  提交
+    handleSubmit () {},
+    //  导入明细
+    handleImport () {
+      console.log(333)
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/chainTransferOut/list' })
+    },
+    filterOption (input, option) {
       	return (
       		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       	)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
+}
 </script>
 
 <style lang="less">

+ 43 - 47
src/views/allocationManagement/chainTransferOut/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="chainTransferOutList-wrap">
+  <a-card size="small" :bordered="false" class="chainTransferOutList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -7,13 +7,13 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="创建时间">
               <a-range-picker
-                  style="width:100%"
-                  id="chainTransferOutList-createDate"
-                  :disabledDate="disabledDate"
-                  v-model="createDate"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
-              </a-form-item>
+                style="width:100%"
+                id="chainTransferOutList-createDate"
+                :disabledDate="disabledDate"
+                v-model="createDate"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -74,18 +74,23 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1500 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span :class="record.state==1?'green':'red'"> {{ record.state==1? '待提交': '待审核' }} </span>
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
-        <a-button size="small" @click="handleEdit(record)" id="chainTransferOutList-edit-btn" style="margin: 0 0 10px 8px;">编辑</a-button>
-        <a-button size="small" type="primary" @click="handleOut(record)" id="chainTransferOutList-out-btn" style="margin: 0 0 10px 8px;">出库</a-button>
-        <a-button size="small" type="primary" @click="handleDetail(record)" id="chainTransferOutList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="chainTransferOutList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="chainTransferOutList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleOut(record)" id="chainTransferOutList-out-btn">出库</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="chainTransferOutList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="chainTransferOutList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑 -->
@@ -101,32 +106,33 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
-      createDate: undefined,  //  创建时间
+      advanced: false, // 高级搜索 展开/关闭
+      createDate: undefined, //  创建时间
       queryParam: { //  查询条件
         putTenantName: undefined, //  调往对象
         allocationType: undefined, //  调出产品类型
-        state: undefined,  //  单据状态
+        state: undefined //  单据状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 },
-        { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '调往对象', dataIndex: 'putTenantName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'putTenantName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'allocationType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 260, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.queryParam = {}
-        return allocLinkageOutList( Object.assign(parameter, this.queryParam) ).then(res => {
+        return allocLinkageOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -136,8 +142,8 @@ export default {
           return data
         })
       },
-      openModal: false,  //  新增编辑  弹框
-      itemId: ''  //  当前品牌id
+      openModal: false, //  新增编辑  弹框
+      itemId: '' //  当前品牌id
     }
   },
   methods: {
@@ -154,11 +160,11 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  基本信息  保存
-    handleOk(){
+    handleOk () {
       this.$router.push({ path: `/allocationManagement/chainTransferOut/add` })
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -180,11 +186,11 @@ export default {
       })
     },
     //  出库
-    handleOut(row){
-      
+    handleOut (row) {
+
     },
     //  审核
-    handleExamine(){
+    handleExamine () {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -206,23 +212,13 @@ export default {
       })
     },
     //  详情
-    handleDetail(row){
+    handleDetail (row) {
       this.$router.push({ path: `/allocationManagement/chainTransferOut/detail/${row.id}/${row.allocationLinkageOutSn}` })
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       this.openModal = true
-    },
+    }
   }
 }
 </script>
-
-<style lang="less">
-  .chainTransferOutList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

+ 59 - 58
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -11,7 +11,7 @@
         <a-button key="1" type="primary" id="storeTransferOutDetail-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <a-card :bordered="false" class="storeTransferOutDetail-cont">
+    <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
       <a-descriptions :column="3">
         <a-descriptions-item label="调往对象">箭冠营销中心</a-descriptions-item>
         <a-descriptions-item label="店内调出单号">箭冠营销中心</a-descriptions-item>
@@ -25,7 +25,7 @@
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">总款数:<strong>1</strong>,总数量:<strong>1</strong>,总成本(¥):<strong>240</strong></div>
     </a-alert>
-    <a-card :bordered="false" class="storeTransferOutDetail-cont">
+    <a-card size="small" :bordered="false" class="storeTransferOutDetail-cont">
       <!-- 列表 -->
       <s-table
         class="sTable"
@@ -34,10 +34,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1200 }"
         bordered>
         <!-- 成本小计 -->
-        <template slot="costSubtotal" slot-scope="text, record">
-          <span>{{(record.outCost * record.outQty) || 0}}</span>
+        <template slot="totalCost" slot-scope="text, record">
+          <span>{{ (record.outCost * record.outQty) || 0 }}</span>
         </template>
       </s-table>
     </a-card>
@@ -45,64 +46,64 @@
 </template>
 
 <script>
-  import { storeCallOutDetailList } from '@/api/storeCallOut'
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          storeCallOutSn: this.$route.params.sn
-        },
-        disabled: false, //  查询、重置按钮是否可操作
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-          { title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'outCost', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '调出仓库', dataIndex: 'warehouseName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', dataIndex: 'outQty', align: 'center' },
-          { title: '成本小计(¥)', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          this.queryParam = {}
-          return storeCallOutDetailList( Object.assign(parameter, this.queryParam) ).then(res => {
-            const data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            this.disabled = false
-            return data
-          })
-        },
+import { storeCallOutDetailList } from '@/api/storeCallOut'
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+        storeCallOutSn: this.$route.params.sn
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调出仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', dataIndex: 'outQty', width: 100, align: 'center' },
+        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: 135, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.queryParam = {}
+        return storeCallOutDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          this.disabled = false
+          return data
+        })
       }
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
     },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  提交
-      handleSubmit(){},
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/storeTransferOut/list'})
-      },
+    //  提交
+    handleSubmit () {},
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 164 - 147
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -12,12 +12,19 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
             基础信息
-            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="storeTransferOutEdit-circle-btn" @click.stop="handleEditInfo" />
+            <a-button
+              type="primary"
+              shape="circle"
+              size="small"
+              icon="edit"
+              class="edit-circle-btn"
+              id="storeTransferOutEdit-circle-btn"
+              @click.stop="handleEditInfo" />
           </template>
           <a-descriptions :column="3">
             <a-descriptions-item label="调往对象">箭冠营销中心</a-descriptions-item>
@@ -26,7 +33,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="选择产品">
           <!-- 筛选条件 -->
@@ -62,7 +69,14 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品品牌">
-                      <a-select placeholder="请选择" id="storeTransferOutEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                      <a-select
+                        placeholder="请选择"
+                        id="storeTransferOutEdit-state"
+                        allowClear
+                        v-model="queryParam.dataSourceNo"
+                        :showSearch="true"
+                        option-filter-prop="children"
+                        :filter-option="filterOption">
                         <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -87,17 +101,18 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1020 }"
             bordered>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="primary" @click="handleAdd(record)" id="storeTransferOutEdit-add-btn">添加</a-button>
+              <a-button size="small" type="link" @click="handleAdd(record)" id="storeTransferOutEdit-add-btn">添加</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="storeTransferOutEdit-cont">
+    <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="已选产品">
           <!-- 总计 -->
@@ -110,12 +125,12 @@
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                   <a-row :gutter="15">
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品编码" prop="name">
                         <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
                       </a-form-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品名称" prop="name">
                         <a-input id="storeTransferOutEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
                       </a-form-item>
@@ -129,7 +144,7 @@
               </div>
             </a-col>
             <a-col :span="3">
-              <a-button style="margin-left: 8px" id="storeTransferOutEdit-import-btn">导入明细</a-button>
+              <a-button size="small" style="margin-left: 8px" id="storeTransferOutEdit-import-btn">导入明细</a-button>
             </a-col>
           </a-row>
           <!-- 列表 -->
@@ -140,6 +155,7 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :data="chooseLoadData"
+            :scroll="{ x: 1235 }"
             bordered>
             <!-- 调出数量 -->
             <template slot="transferOutQuantity" slot-scope="text, record">
@@ -153,7 +169,7 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="danger" @click="handleDel(record)" id="storeTransferOutEdit-del-btn">删除</a-button>
+              <a-button size="small" type="link" @click="handleDel(record)" id="storeTransferOutEdit-del-btn">删除</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -170,151 +186,152 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import basicInfoModal from './basicInfoModal.vue'
-  export default{
-    components: { STable, VSelect, basicInfoModal },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        disabled: false, //  查询、重置按钮是否可操作
-        advanced: false,  // 高级搜索 展开/关闭
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center' },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'custsNdame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'custsNafme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '成本价', dataIndex: 'storageQuantity', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本价', dataIndex: 'storageQuantity', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '仓库', dataIndex: 'custsNdame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'custsNafme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '成本小计', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  基本信息  保存
-      handleOk(){
-        
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      queryParam: {
+
       },
-      //  提交
-      handleSubmit(){},
-      //  导入明细
-      handleImport(){
-        console.log(333)
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      disabled: false, //  查询、重置按钮是否可操作
+      advanced: false, // 高级搜索 展开/关闭
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center' },
+        { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'custsNdame', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'custsNafme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'custsNagme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价(¥)', dataIndex: 'storageQuantity', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/storeTransferOut/list'})
+      // 表头
+      chooseColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'storageQuantity', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', dataIndex: 'custsNdame', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'custsNafme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 150, align: 'center' },
+        { title: '成本小计(¥)', dataIndex: 'custsNagme', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      filterOption(input, option) {
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  提交
+    handleSubmit () {},
+    //  导入明细
+    handleImport () {
+      console.log(333)
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/storeTransferOut/list' })
+    },
+    filterOption (input, option) {
       	return (
       		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       	)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
+}
 </script>
 
 <style lang="less">

+ 41 - 45
src/views/allocationManagement/storeTransferOut/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="storeTransferOutList-wrap">
+  <a-card size="small" :bordered="false" class="storeTransferOutList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -7,13 +7,13 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="创建时间">
               <a-range-picker
-                  style="width:100%"
-                  id="storeTransferOutList-bundleNamesss"
-                  :disabledDate="disabledDate"
-                  v-model="createDate"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
-              </a-form-item>
+                style="width:100%"
+                id="storeTransferOutList-bundleNamesss"
+                :disabledDate="disabledDate"
+                v-model="createDate"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -74,18 +74,23 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1500 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span :class="record.state==1?'green':'red'"> {{ record.state==1? '待提交': '待审核' }} </span>
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record)" id="storeTransferOutList-examine-btn">审核</a-button>
-        <a-button size="small" @click="handleEdit(record)" id="storeTransferOutList-edit-btn" style="margin: 0 0 10px 8px;">编辑</a-button>
-        <a-button size="small" type="primary" @click="handleOut(record)" id="storeTransferOutList-out-btn" style="margin: 0 0 10px 8px;">出库</a-button>
-        <a-button size="small" type="primary" @click="handleDetail(record)" id="storeTransferOutList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="storeTransferOutList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record)" id="storeTransferOutList-examine-btn">审核</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="storeTransferOutList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleOut(record)" id="storeTransferOutList-out-btn">出库</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="storeTransferOutList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="storeTransferOutList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑 -->
@@ -101,32 +106,33 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
-      createDate: undefined,  //  创建时间
+      advanced: false, // 高级搜索 展开/关闭
+      createDate: undefined, //  创建时间
       queryParam: { //  查询条件
         putPersonName: undefined, //  调往对象
         callOutType: undefined, //  调拨类型
-        state: undefined,  //  单据状态
+        state: undefined //  单据状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 },
-        { title: '店内调出单号', dataIndex: 'storeCallOutNo', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '调往对象', dataIndex: 'putPersonName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
+        { title: '店内调出单号', dataIndex: 'storeCallOutNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'putPersonName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '调拨类型', dataIndex: 'callOutType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
+        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 260, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.queryParam = {}
-        return storeCallOutList( Object.assign(parameter, this.queryParam) ).then(res => {
+        return storeCallOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -136,8 +142,8 @@ export default {
           return data
         })
       },
-      openModal: false,  //  新增编辑  弹框
-      itemId: ''  //  当前品牌id
+      openModal: false, //  新增编辑  弹框
+      itemId: '' //  当前品牌id
     }
   },
   methods: {
@@ -154,7 +160,7 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  基本信息  保存
-    handleOk(){
+    handleOk () {
       this.$router.push({ path: `/allocationManagement/storeTransferOut/add` })
     },
     //  删除
@@ -180,9 +186,9 @@ export default {
       })
     },
     //  出库
-    handleOut(row){},
+    handleOut (row) {},
     //  审核
-    handleExamine(){
+    handleExamine () {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -204,23 +210,13 @@ export default {
       })
     },
     //  详情
-    handleDetail(row){
+    handleDetail (row) {
       this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.id}/${row.storeCallOutSn}` })
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       this.openModal = true
-    },
+    }
   }
 }
 </script>
-
-<style lang="less">
-  .storeTransferOutList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

+ 72 - 71
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -13,7 +13,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="warehouseAllocationDetail-cont">
+    <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -29,7 +29,7 @@
       </a-collapse>
     </a-card>
     <!-- 详情 -->
-    <a-card :bordered="false" class="warehouseAllocationDetail-cont">
+    <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
@@ -44,19 +44,20 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1335 }"
             bordered>
             <!-- 产品类别 -->
             <template slot="productType" slot-scope="text, record">
               <a-tooltip placement="top">
                 <template slot="title">
-                  <span>{{record.productTypeName}}</span>
+                  <span>{{ record.productTypeName }}</span>
                 </template>
-                {{record.productTypeName3}}
+                {{ record.productTypeName3 }}
               </a-tooltip>
             </template>
             <!-- 成本小计 -->
-            <template slot="costSubtotal" slot-scope="text, record">
-              <span>{{(record.allocationCost * record.allocationQty) || 0}}</span>
+            <template slot="totalCost" slot-scope="text, record">
+              <span>{{ (record.allocationCost * record.allocationQty) || 0 }}</span>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -66,76 +67,76 @@
 </template>
 
 <script>
-  import { allocWarehouseDetailList } from '@/api/allocWarehouse'
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        exportLoading: false, // 导出loading
-        queryParam: {
-          allocationWarehouseSn: this.$route.params.sn
-        },
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'productCode', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '类别', scopedSlots: { customRender: 'productType' }, align: 'center' },
-          { title: '数量', dataIndex: 'allocationQty', align: 'center' },
-          { title: '单位', dataIndex: 'productUnit', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '成本小计', scopedSlots: { customRender: 'costSubtotal' }, align: 'center' },
-          { title: '调出仓位', dataIndex: 'outWarehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调入仓位', dataIndex: 'putWarehouseLocationName', align: 'center', customRender: function (text) { return text || '--' } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          return allocWarehouseDetailList( Object.assign(parameter, this.queryParam) ).then(res => {
-            const data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-              const productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
-              const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
-              const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
-              data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
-            }
-            this.disabled = false
-            return data
-          })
-        },
-      }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/warehouseAllocation/list'})
+import { allocWarehouseDetailList } from '@/api/allocWarehouse'
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      exportLoading: false, // 导出loading
+      queryParam: {
+        allocationWarehouseSn: this.$route.params.sn
       },
-      //  导出
-      handleExport () {
-        const params = this.queryParam
-        this.exportLoading = true
-        customerBundleExportDelay(params).then(res => {
-          this.exportLoading = false
-          this.download(res)
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', scopedSlots: { customRender: 'productType' }, width: 160, align: 'center' },
+        { title: '数量', dataIndex: 'allocationQty', width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计(¥)', scopedSlots: { customRender: 'totalCost' }, width: 135, align: 'center' },
+        { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓位', dataIndex: 'putWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        return allocWarehouseDetailList(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+            const productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
+            const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
+            const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
+            data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
+          }
+          this.disabled = false
+          return data
         })
-      },
-      download (data) {
-        if (!data) { return }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        const a = moment().format('YYYYMMDDHHmmss')
-        const fname = '仓库调拨' + a
-        link.setAttribute('download', fname + '.xlsx')
-        document.body.appendChild(link)
-        link.click()
       }
     }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
+    },
+    //  导出
+    handleExport () {
+      const params = this.queryParam
+      this.exportLoading = true
+      customerBundleExportDelay(params).then(res => {
+        this.exportLoading = false
+        this.download(res)
+      })
+    },
+    download (data) {
+      if (!data) { return }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      const a = moment().format('YYYYMMDDHHmmss')
+      const fname = '仓库调拨' + a
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
+    }
   }
+}
 </script>
 
 <style lang="less">

+ 176 - 158
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -12,12 +12,19 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="warehouseAllocationEdit-cont">
+    <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
             基础信息
-            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="warehouseAllocationEdit-circle-btn" @click.stop="handleEditInfo" />
+            <a-button
+              type="primary"
+              shape="circle"
+              size="small"
+              icon="edit"
+              class="edit-circle-btn"
+              id="warehouseAllocationEdit-circle-btn"
+              @click.stop="handleEditInfo" />
           </template>
           <a-descriptions :column="3">
             <a-descriptions-item label="调出仓库">箭冠营销中心</a-descriptions-item>
@@ -27,7 +34,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="warehouseAllocationEdit-cont">
+    <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="选择产品">
           <!-- 筛选条件 -->
@@ -52,7 +59,14 @@
                 <template v-if="advanced">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品品牌">
-                      <a-select placeholder="请选择" id="warehouseAllocationEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                      <a-select
+                        placeholder="请选择"
+                        id="warehouseAllocationEdit-state"
+                        allowClear
+                        v-model="queryParam.dataSourceNo"
+                        :showSearch="true"
+                        option-filter-prop="children"
+                        :filter-option="filterOption">
                         <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -93,11 +107,12 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1560 }"
             bordered>
             <!-- 调入仓位 -->
             <template slot="storageQuantity" slot-scope="text, record">
-              <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse">
-              	<a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+              <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse" style="width: 100%;">
+                <a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
               </a-select>
             </template>
             <!-- 调出数量 -->
@@ -112,14 +127,14 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="primary" @click="handleAdd(record)" id="warehouseAllocationEdit-add-btn">添加</a-button>
+              <a-button size="small" type="link" @click="handleAdd(record)" id="warehouseAllocationEdit-add-btn">添加</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="warehouseAllocationEdit-cont">
+    <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="已选产品">
           <!-- 总计 -->
@@ -128,16 +143,16 @@
           </a-alert>
           <!-- 筛选条件 -->
           <a-row :gutter="15" justify="space-between">
-            <a-col :span="18">
+            <a-col :span="17">
               <div class="table-page-search-wrapper">
                 <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                   <a-row :gutter="15">
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品编码" prop="name">
                         <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品编码" allowClear />
                       </a-form-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
+                    <a-col :md="9" :sm="24">
                       <a-form-item label="产品名称" prop="name">
                         <a-input id="warehouseAllocationEdit-name" v-model="queryParam.name" placeholder="请输入产品名称" allowClear />
                       </a-form-item>
@@ -150,10 +165,10 @@
                 </a-form>
               </div>
             </a-col>
-            <a-col :span="6">
-              <a-button type="primary" id="warehouseAllocationEdit-pladd-btn">批量添加</a-button>
-              <a-button style="margin-left: 8px" id="warehouseAllocationEdit-import-btn">导入明细</a-button>
-              <a-button type="danger" style="margin-left: 8px" id="warehouseAllocationEdit-del-all-btn">整单删除</a-button>
+            <a-col :span="7">
+              <a-button size="small" type="primary" id="warehouseAllocationEdit-pladd-btn" style="margin-bottom: 8px;">批量添加</a-button>
+              <a-button size="small" id="warehouseAllocationEdit-import-btn" style="margin-left: 8px">导入明细</a-button>
+              <a-button size="small" type="danger" id="warehouseAllocationEdit-del-all-btn" style="margin: 0 0 8px 8px;">整单删除</a-button>
             </a-col>
           </a-row>
           <!-- 列表 -->
@@ -164,11 +179,12 @@
             :rowKey="(record) => record.id"
             :columns="chooseColumns"
             :data="chooseLoadData"
+            :scroll="{ x: 1460 }"
             bordered>
             <!-- 调入仓位 -->
             <template slot="storageQuantity" slot-scope="text, record">
-              <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse">
-              	<a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+              <a-select id="warehouseAllocationEdit-warehouse" placeholder="请选择" allowClear v-model="record.warehouse" style="width: 100%;">
+                <a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
               </a-select>
             </template>
             <!-- 调出数量 -->
@@ -183,7 +199,7 @@
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record">
-              <a-button type="danger" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
+              <a-button size="small" type="link" @click="handleDel(record)" id="warehouseAllocationEdit-del-btn">删除</a-button>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -200,154 +216,156 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import basicInfoModal from './basicInfoModal.vue'
-  export default{
-    components: { STable, VSelect, basicInfoModal },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        disabled: false, //  查询、重置按钮是否可操作
-        advanced: false,  // 高级搜索 展开/关闭
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNahme', align: 'center', ellipsis: true },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '品牌', dataIndex: 'custsNsame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '类别', dataIndex: 'custsNdame', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出仓位', dataIndex: 'custsNafme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调入仓位', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '库存数量', dataIndex: 'custsNagme', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '单位', dataIndex: 'custsNsagme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custNayme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'custNdayme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '品牌', dataIndex: 'mementPsay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '类别', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出仓位', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '调入仓位', dataIndex: 'custsNakme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'custssNakme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  基本信息  保存
-      handleOk(){
-        
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      queryParam: {
+
       },
-      //  提交
-      handleSubmit(){},
-      //  导入明细
-      handleImport(){
-        console.log(333)
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      disabled: false, //  查询、重置按钮是否可操作
+      advanced: false, // 高级搜索 展开/关闭
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custNahme', width: 200, align: 'center', ellipsis: true },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'custsNsame', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', dataIndex: 'custsNdame', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出仓位', dataIndex: 'custsNafme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调入仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
+        { title: '库存数量', dataIndex: 'custsNagme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'custsNsagme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/allocationManagement/warehouseAllocation/list'})
+      // 表头
+      chooseColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDaite', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custNayme', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'custNdayme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'mementPsay', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类别', dataIndex: 'mementPay', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出仓位', scopedSlots: { customRender: 'storageQuantity' }, width: 140, align: 'center' },
+        { title: '调入仓位', dataIndex: 'custsNakme', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'custssNakme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调出数量', scopedSlots: { customRender: 'transferOutQuantity' }, width: 140, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      filterOption(input, option) {
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  提交
+    handleSubmit () {},
+    //  导入明细
+    handleImport () {
+      console.log(333)
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/allocationManagement/warehouseAllocation/list' })
+    },
+    filterOption (input, option) {
       	return (
       		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       	)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
+}
 </script>
 
 <style lang="less">

+ 39 - 44
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="warehouseAllocationList-wrap">
+  <a-card size="small" :bordered="false" class="warehouseAllocationList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -7,13 +7,13 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="创建时间">
               <a-range-picker
-                  style="width:100%"
-                  id="warehouseAllocationList-creatDate"
-                  :disabledDate="disabledDate"
-                  v-model="creatDate"
-                  :format="dateFormat"
-                  :placeholder="['开始时间', '结束时间']" />
-              </a-form-item>
+                style="width:100%"
+                id="warehouseAllocationList-creatDate"
+                :disabledDate="disabledDate"
+                v-model="creatDate"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
+            </a-form-item>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -74,17 +74,21 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1435 }"
       bordered>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
-        <span :class="record.state==1?'green':'red'"> {{ record.state==1? '待提交': '待审核' }} </span>
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
-        <a-button size="small" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn" style="margin: 0 0 8px 8px;">编辑</a-button>
-        <a-button size="small" type="primary" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="warehouseAllocationList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button size="small" type="link" @click="handleExamine(record)" id="warehouseAllocationList-examine-btn">审核</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="warehouseAllocationList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="warehouseAllocationList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="warehouseAllocationList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑 -->
@@ -100,32 +104,33 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
-      creatDate: undefined,  //  创建时间
+      advanced: false, // 高级搜索 展开/关闭
+      creatDate: undefined, //  创建时间
       queryParam: { //  查询条件
         outWarehouseName: undefined, //  调出仓库
         putWarehouseName: undefined, //  调入仓库
-        state: undefined,  //  审核状态
+        state: undefined //  审核状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '单号', dataIndex: 'allocationWarehouseNo', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '调出仓库', dataIndex: 'outWarehouseName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调入仓库', dataIndex: 'putWarehouseName', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' }
+        { title: '调出仓库', dataIndex: 'outWarehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调入仓库', dataIndex: 'putWarehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 215, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.queryParam = {}
-        return allocWarehouseList( Object.assign(parameter, this.queryParam) ).then(res => {
+        return allocWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -135,8 +140,8 @@ export default {
           return data
         })
       },
-      openModal: false,  //  新增编辑  弹框
-      itemId: ''  //  当前品牌id
+      openModal: false, //  新增编辑  弹框
+      itemId: '' //  当前品牌id
     }
   },
   methods: {
@@ -153,11 +158,11 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  基本信息  保存
-    handleOk(){
+    handleOk () {
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/add` })
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -179,7 +184,7 @@ export default {
       })
     },
     //  审核
-    handleExamine(){
+    handleExamine () {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -201,28 +206,18 @@ export default {
       })
     },
     //  详情
-    handleDetail(row){
+    handleDetail (row) {
       this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.id}/${row.allocationWarehouseSn}` })
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       // if(row){  //  编辑
       //   this.$router.push({ path: `/allocationManagement/warehouseAllocation/edit/${row.id}` })
       // }else{  //  新增
       //   this.$router.push({ path: '/allocationManagement/warehouseAllocation/add' })
       // }
       this.openModal = true
-    },
+    }
   }
 }
 </script>
-
-<style lang="less">
-  .warehouseAllocationList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>

+ 1 - 1
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="bulkPartsTypeList-wrap">
+  <a-card size="small" :bordered="false" class="bulkPartsTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
       <a-button id="bulkPartsTypeList-add" type="primary" @click="handleEdit()">新增散件类型</a-button>

+ 1 - 1
src/views/basicData/customerTypeManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="customerTypeList-wrap">
+  <a-card size="small" :bordered="false" class="customerTypeList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/basicData/expenseType/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="expenseTypeList-wrap">
+  <a-card size="small" :bordered="false" class="expenseTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
       <a-button id="expenseTypeList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级分类</a-button>

+ 1 - 1
src/views/basicData/processSettings/setup.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="processSettingsSetup-wrap">
+  <a-card size="small" :bordered="false" class="processSettingsSetup-wrap">
     <a-alert message="提示:勾选某个节点时表示需要该节点流程" type="warning" show-icon />
     <a-form-model
       id="processSettingsSetup-form"

+ 1 - 1
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="storeTransferOutTypeList-wrap">
+  <a-card size="small" :bordered="false" class="storeTransferOutTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
       <a-button id="storeTransferOutTypeList-add" type="primary" @click="handleEdit()">新增店内调出类型</a-button>

+ 3 - 3
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkReturnGoodsEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -37,7 +37,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkReturnGoodsEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -106,7 +106,7 @@
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="bulkReturnGoodsEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkReturnGoodsEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="bulkReturnGoodsList-wrap">
+  <a-card size="small" :bordered="false" class="bulkReturnGoodsList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -19,7 +19,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -33,7 +33,7 @@
       </a-collapse>
     </a-card>
     <!-- 产品详情 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="产品详情">
           <!-- 总计 -->
@@ -62,7 +62,7 @@
       </a-collapse>
     </a-card>
     <!-- 单据记录 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="单据记录">
           <a-timeline class="timeline-box">

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -16,7 +16,7 @@
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -31,7 +31,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -118,7 +118,7 @@
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="bulkWarehousingOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="bulkWarehousingOrderList-wrap">
+  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/warehousing.vue

@@ -8,7 +8,7 @@
     </a-page-header>
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
-    <a-card :bordered="false" class="bulkWarehousingOrderWarehousing-cont">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderWarehousing-cont">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -6,7 +6,7 @@
         <a id="customerManagementEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
     </a-page-header>
-    <a-card :bordered="false" class="customerManagementEdit-table-page-wrapper">
+    <a-card size="small" :bordered="false" class="customerManagementEdit-table-page-wrapper">
       <a-form-model
         id="customerManagementEdit-form"
         ref="ruleForm"

+ 1 - 1
src/views/customerManagement/customerInfo/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="customerManagementList-wrap">
+  <a-card size="small" :bordered="false" class="customerManagementList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="companyCollectionPaymentDetail-cont">
+    <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -32,7 +32,7 @@
       </a-collapse>
     </a-card>
     <!-- 收款明细 -->
-    <a-card :bordered="false" class="companyCollectionPaymentDetail-cont">
+    <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款明细">
           <!-- alert -->

+ 1 - 1
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="companyCollectionPaymentList-wrap">
+  <a-card size="small" :bordered="false" class="companyCollectionPaymentList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="companyReceivablePayableList-wrap">
+  <a-card size="small" :bordered="false" class="companyReceivablePayableList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/paymentSlip.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="客户:抢个汽修厂" ></a-page-header>
     <!-- 付款信息 -->
-    <a-card :bordered="false" class="paymentSlipEdit-cont">
+    <a-card size="small" :bordered="false" class="paymentSlipEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="付款信息">
           <a-form-model
@@ -71,7 +71,7 @@
       </a-collapse>
     </a-card>
     <!-- 付款明细 -->
-    <a-card :bordered="false" class="paymentSlipEdit-cont">
+    <a-card size="small" :bordered="false" class="paymentSlipEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">

+ 2 - 2
src/views/financialManagement/companyReceivablePayable/receipt.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="客户:抢个汽修厂" ></a-page-header>
     <!-- 收款信息 -->
-    <a-card :bordered="false" class="receiptEdit-cont">
+    <a-card size="small" :bordered="false" class="receiptEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="收款信息">
           <a-form-model
@@ -71,7 +71,7 @@
       </a-collapse>
     </a-card>
     <!-- 收款明细 -->
-    <a-card :bordered="false" class="receiptEdit-cont">
+    <a-card size="small" :bordered="false" class="receiptEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">

+ 1 - 1
src/views/financialManagement/expenseManagement/edit.vue

@@ -6,7 +6,7 @@
 				<a id="expenseManagementEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
 			</template>
 		</a-page-header>
-		<a-card :bordered="false" class="expenseManagementEdit-table-page-wrapper">
+		<a-card size="small" :bordered="false" class="expenseManagementEdit-table-page-wrapper">
 			<a-form-model
 				id="expenseManagementEdit-form"
 				ref="ruleForm"

+ 1 - 1
src/views/financialManagement/expenseManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="expenseManagementList-wrap">
+  <a-card size="small" :bordered="false" class="expenseManagementList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="financialCollectionList-wrap">
+  <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
     <!-- 标签页 -->
     <a-tabs type="card" @change="handleTabChange" class="financialCollectionList-tabs">
       <a-tab-pane v-for="item in tabPaneData" :key="item.id" :tab="item.name"></a-tab-pane>

+ 1 - 1
src/views/financialManagement/financialPayment/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="financialPaymentList-wrap">
+  <a-card size="small" :bordered="false" class="financialPaymentList-wrap">
     <!-- 标签页 -->
     <a-tabs type="card" @change="handleTabChange" class="financialPaymentList-tabs">
       <a-tab-pane v-for="item in tabPaneData" :key="item.id" :tab="item.name"></a-tab-pane>

+ 2 - 2
src/views/financialManagement/inventoryReview/detail.vue

@@ -18,7 +18,7 @@
       <div slot="message"><strong class="red">红色代表盘盈</strong>,<strong class="green">绿色代表盈亏</strong></div>
     </a-alert>
     <!-- 盈亏统计 -->
-    <a-card :bordered="false" class="inventoryReviewDetail-cont">
+    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="盈亏统计">
           <a-descriptions :column="2" bordered>
@@ -57,7 +57,7 @@
       </a-collapse>
     </a-card>
     <!-- 产品明细 -->
-    <a-card :bordered="false" class="inventoryReviewDetail-cont">
+    <a-card size="small" :bordered="false" class="inventoryReviewDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="产品明细">
           <!-- 列表 -->

+ 1 - 1
src/views/financialManagement/inventoryReview/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="inventoryReviewList-wrap">
+  <a-card size="small" :bordered="false" class="inventoryReviewList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/financialManagement/ledgerRecord/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="ledgerRecordList-wrap">
+  <a-card size="small" :bordered="false" class="ledgerRecordList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 2 - 2
src/views/financialManagement/warehousingAudit/detail.vue

@@ -14,7 +14,7 @@
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="warehousingAuditDetail-cont">
+    <a-card size="small" :bordered="false" class="warehousingAuditDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -34,7 +34,7 @@
       </a-collapse>
     </a-card>
     <!-- 入库明细 -->
-    <a-card :bordered="false" class="warehousingAuditDetail-cont">
+    <a-card size="small" :bordered="false" class="warehousingAuditDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="入库明细">
           <!-- 列表 -->

+ 1 - 1
src/views/financialManagement/warehousingAudit/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="warehousingAuditList-wrap">
+  <a-card size="small" :bordered="false" class="warehousingAuditList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/financialManagement/withdrawalManagement/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="withdrawalManagementList-wrap">
+  <a-card size="small" :bordered="false" class="withdrawalManagementList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 14 - 14
src/views/inventoryManagement/inventoryChecking/checkingTipsModal.vue

@@ -43,7 +43,7 @@ import { STable } from '@/components'
 import checkingTypeModal from './checkingTypeModal.vue'
 // import { checkingTipsSave } from '@/api/checkingTips'
 export default {
-  name: 'checkingTipsEditModal',
+  name: 'CheckingTipsEditModal',
   components: { STable, checkingTypeModal },
   props: {
     openModal: { //  弹框显示状态
@@ -65,10 +65,10 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单号', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据状态', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单号', dataIndex: 'nsso', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'sort', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'name', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -79,7 +79,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -95,26 +95,26 @@ export default {
           resolve(data)
         })
       },
-      openTypeModal: false,  //  新增编辑  弹框
-      nowTypeData: null  //  当前记录数据
+      openTypeModal: false, //  新增编辑  弹框
+      nowTypeData: null //  当前记录数据
     }
   },
   methods: {
     //  详情
-    getDetail(){
-      
+    getDetail () {
+
     },
     //  开始盘点
-    handleCheck(){
+    handleCheck () {
       this.openTypeModal = true
     },
     //  新增/编辑  成功
-    handleOk(type){
+    handleOk (type) {
       this.$emit('ok', type)
       this.isShow = false
     },
     //  关闭弹框
-    closeModal(){
+    closeModal () {
       this.openTypeModal = false
     },
     //  导出
@@ -147,7 +147,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-      }else{
+      } else {
         this.form = {
           name: '',
           sort: ''

+ 142 - 106
src/views/inventoryManagement/inventoryChecking/detail.vue

@@ -11,7 +11,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="inventoryCheckingDetail-cont">
+    <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -23,12 +23,17 @@
       </a-collapse>
     </a-card>
     <!-- 详情 -->
-    <a-card :bordered="false" class="inventoryCheckingDetail-cont">
+    <a-card size="small" :bordered="false" class="inventoryCheckingDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->
           <a-alert type="info" showIcon style="margin-bottom:15px">
-            <div slot="message">库存总数量: <strong>6</strong> ,盈亏总数量: <strong>6</strong></div>
+            <div slot="message">
+              库存总数量:
+              <strong>6</strong>
+              ,盈亏总数量:
+              <strong>6</strong>
+            </div>
           </a-alert>
           <!-- 筛选条件 -->
           <div class="table-page-search-wrapper">
@@ -49,21 +54,14 @@
             </a-form>
           </div>
           <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="default"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            bordered>
+          <s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
             <!-- 采购数量 -->
             <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
+              <span>{{ record.purchaseNum }}</span>
             </template>
             <!-- 缺货数量 -->
             <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
+              <span>{{ record.outOfStockNum }}</span>
             </template>
           </s-table>
         </a-collapse-panel>
@@ -73,107 +71,145 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          dataSourceNo: undefined
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data() {
+    return {
+      queryParam: {
+        dataSourceNo: undefined
+      },
+      exportLoading: false, // 导出loading
+      disabled: false, //  查询、重置按钮是否可操作
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        {
+          title: '产品编码',
+          dataIndex: 'creatDate',
+          align: 'center',
+          customRender: function(text) {
+            return text || '--';
+          }
         },
-        exportLoading: false, // 导出loading
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '盘点数量', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盈亏数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
+        {
+          title: '产品名称',
+          dataIndex: 'custName',
+          align: 'center',
+          customRender: function(text) {
+            return text || '--';
+          }
         },
-        brandData: []
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm(){},
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
-      },
-      //  导出
-      handleExport () {
-        const params = this.queryParam
-        if (this.oldTime && this.oldTime.length > 0) {
-          params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
-          params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginOldExpiryDate = ''
-          params.endOldExpirydDate = ''
-        }
-        if (this.newTime && this.newTime.length > 0) {
-          params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
-          params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginDate = ''
-          params.endDate = ''
+        {
+          title: '单位',
+          dataIndex: 'mementPay',
+          align: 'center',
+          customRender: function(text) {
+            return text || '--';
+          }
+        },
+        { title: '库存数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
+        {
+          title: '盘点数量',
+          dataIndex: 'tostalP',
+          align: 'center',
+          customRender: function(text) {
+            return text || text == 0 ? text : '--';
+          }
+        },
+        {
+          title: '盈亏数量',
+          dataIndex: 'totalNums',
+          align: 'center',
+          customRender: function(text) {
+            return text || text == 0 ? text : '--';
+          }
         }
-        this.exportLoading = true
-        customerBundleExportDelay(params).then(res => {
-          this.exportLoading = false
-          this.download(res)
-        })
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true;
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this;
+        return new Promise(function(resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          };
+          const no = (data.pageNo - 1) * data.pageSize;
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1;
+          }
+          _this.disabled = false;
+          resolve(data);
+        });
       },
-      download (data) {
-        if (!data) { return }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        const a = moment().format('YYYYMMDDHHmmss')
-        const fname = '仓库调拨' + a
-        link.setAttribute('download', fname + '.xlsx')
-        document.body.appendChild(link)
-        link.click()
+      brandData: []
+    };
+  },
+  methods: {
+    //  重置
+    resetSearchForm() {},
+    //  返回列表
+    handleBack() {
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' });
+    },
+    //  导出
+    handleExport() {
+      const params = this.queryParam;
+      if (this.oldTime && this.oldTime.length > 0) {
+        params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD');
+        params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD');
+      } else {
+        params.beginOldExpiryDate = '';
+        params.endOldExpirydDate = '';
+      }
+      if (this.newTime && this.newTime.length > 0) {
+        params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD');
+        params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD');
+      } else {
+        params.beginDate = '';
+        params.endDate = '';
       }
+      this.exportLoading = true;
+      customerBundleExportDelay(params).then(res => {
+        this.exportLoading = false;
+        this.download(res);
+      });
+    },
+    download(data) {
+      if (!data) {
+        return;
+      }
+      const url = window.URL.createObjectURL(new Blob([data]));
+      const link = document.createElement('a');
+      link.style.display = 'none';
+      link.href = url;
+      const a = moment().format('YYYYMMDDHHmmss');
+      const fname = '仓库调拨' + a;
+      link.setAttribute('download', fname + '.xlsx');
+      document.body.appendChild(link);
+      link.click();
     }
   }
+};
 </script>
 
 <style lang="less">
-  .inventoryCheckingDetail-cont, .inventoryCheckingDetail-back{
-    margin-bottom: 15px;
-  }
+.inventoryCheckingDetail-cont,
+.inventoryCheckingDetail-back {
+  margin-bottom: 15px;
+}
 </style>

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue

@@ -11,7 +11,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="financialAuditDetail-cont">
+    <a-card size="small" :bordered="false" class="financialAuditDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -25,7 +25,7 @@
       </a-collapse>
     </a-card>
     <!-- 详情 -->
-    <a-card :bordered="false" class="financialAuditDetail-cont">
+    <a-card size="small" :bordered="false" class="financialAuditDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->

+ 48 - 49
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="inventoryCheckingList-wrap">
+  <a-card size="small" :bordered="false" class="inventoryCheckingList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -40,15 +40,23 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
+      :scroll="{ x: 1460 }"
       bordered>
+      <!-- 状态 -->
+      <template slot="state" slot-scope="text, record">
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待单据审核' }}</a-tag>
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEexamine(record)" id="inventoryCheckingList-edit-btn">审核</a-button>
-        <a-button size="small" type="primary" @click="handleInventory(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">盘点</a-button>
-        <a-button size="small" type="primary" @click="handleSupervisionAudit(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">监盘审核</a-button>
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 10px 8px">编辑</a-button>
-        <a-button size="small" @click="handleDetail(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">详情</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="inventoryCheckingList-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="link" @click="handleEexamine(record)" id="inventoryCheckingList-eexamine-btn">审核</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleInventory(record)" id="inventoryCheckingList-inventory-btn">盘点</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="inventoryCheckingList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="inventoryCheckingList-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="inventoryCheckingList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑盘点单 -->
@@ -65,23 +73,23 @@ export default {
   data () {
     return {
       queryParam: { //  查询条件
-        enabledFlag: undefined,  //  状态
-        beginDate: '',  //  创建时间  开始时间
-        endDate: '',  //  创建时间  结束时间
+        enabledFlag: undefined, //  状态
+        beginDate: '', //  创建时间  开始时间
+        endDate: '' //  创建时间  结束时间
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '盘点单号', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存总款数', dataIndex: 'no3', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存总数量', dataIndex: 'n4o', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '开单人', dataIndex: 'neo', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据审核时间', dataIndex: 'shcreateDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'name', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '盘点类型', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '盘点单号', dataIndex: 'nsso', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存总款数', dataIndex: 'no3', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存总数量', dataIndex: 'n4o', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '开单人', dataIndex: 'neo', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单据审核时间', dataIndex: 'shcreateDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 100, align: 'center' },
+        { title: '盘点类型', dataIndex: 'sort', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -92,7 +100,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -101,8 +109,7 @@ export default {
               { id: '2', state: 2, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
               { id: '3', state: 3, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
               { id: '4', state: 4, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
-              { id: '5', state: 5, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
-              { id: '6', state: 6, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
+              { id: '5', state: 5, purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
             ],
             count: 10
           }
@@ -113,9 +120,9 @@ export default {
           resolve(data)
         })
       },
-      openModal: false,  //  新增编辑  弹框
-      itemId: '',  //  当前id
-      nowData: null  //  当前记录数据
+      openModal: false, //  新增编辑  弹框
+      itemId: '', //  当前id
+      nowData: null //  当前记录数据
     }
   },
   methods: {
@@ -124,7 +131,7 @@ export default {
       return date && date.valueOf() > Date.now()
     },
     //  创建时间  change
-    creatTimechange(dates, dateStrings){
+    creatTimechange (dates, dateStrings) {
       this.queryParam.beginDate = dateStrings[0]
       this.queryParam.endDate = dateStrings[1]
     },
@@ -134,38 +141,36 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       this.itemId = row ? row.id : null
-      this.nowData = row ? row : null
+      this.nowData = row || null
       this.openModal = true
     },
     //  新增/编辑  成功
-    handleOk(type){
-      if(type=='a'){
+    handleOk (type) {
+      if (type == 'a') {
         this.$router.push({ path: `/inventoryManagement/inventoryChecking/overall/${this.itemId}` })
-      }else if(type=='b'){
+      } else if (type == 'b') {
         this.$router.push({ path: `/inventoryManagement/inventoryChecking/selfDisk/${this.itemId}` })
       }
     },
     //  关闭弹框
-    closeModal(){
+    closeModal () {
       this.itemId = ''
       this.openModal = false
     },
     //  详情
-    handleDetail(row){
-      if(row.state == 3){  //  待盘点  详情
+    handleDetail (row) {
+      if (row.state == 3) { //  待盘点  详情
         this.$router.push({ path: `/inventoryManagement/inventoryChecking/makeInventory/detail/${row.id}` })
-      }else if(row.state == 4){  //  待监盘审核  详情
-        this.$router.push({ path: `/inventoryManagement/inventoryChecking/supervisionAudit/detail/${row.id}` })
-      }else if(row.state == 5){  //  待财务审核  详情
+      } else if (row.state == 4) { //  待财务审核  详情
         this.$router.push({ path: `/inventoryManagement/inventoryChecking/financialAudit/detail/${row.id}` })
-      }else{  //  其他状态  详情
+      } else { //  其他状态  详情
         this.$router.push({ path: `/inventoryManagement/inventoryChecking/detail/${row.id}` })
       }
     },
     //  审核
-    handleEexamine(row){
+    handleEexamine (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -187,15 +192,11 @@ export default {
       })
     },
     //  盘点
-    handleInventory(row){
+    handleInventory (row) {
       this.$router.push({ path: `/inventoryManagement/inventoryChecking/makeInventory/${row.id}` })
     },
-    //  监盘审核
-    handleSupervisionAudit(row){
-      this.$router.push({ path: `/inventoryManagement/inventoryChecking/supervisionAudit/${row.id}` })
-    },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
@@ -214,9 +215,7 @@ export default {
           // })
         }
       })
-    },
+    }
   }
 }
 </script>
-
-<style lang="less"></style>

+ 101 - 100
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -15,7 +15,7 @@
       </template>
     </a-page-header>
     <!-- 详情 -->
-    <a-card :bordered="false" class="makeInventory-cont">
+    <a-card size="small" :bordered="false" class="makeInventory-cont">
       <!-- 筛选条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -50,6 +50,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1070 }"
         bordered>
         <!-- 盘点数量 -->
         <template slot="outOfStockNum" slot-scope="text, record">
@@ -72,111 +73,111 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          dataSourceNo: undefined
-        },
-        exportLoading: false, // 导出loading
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'memsentPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'memendtPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盘点数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '盈亏数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        typeData: []
-      }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+        dataSourceNo: undefined
       },
-      //  导入
-      handleImport(){},
-      //  下载导入模板
-      handleDownImport(){},
-      //  提交
-      handleSubmit(){},
-      //  重置
-      resetSearchForm(){},
-      //  导出
-      handleExport () {
-        const params = this.queryParam
-        if (this.oldTime && this.oldTime.length > 0) {
-          params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
-          params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginOldExpiryDate = ''
-          params.endOldExpirydDate = ''
-        }
-        if (this.newTime && this.newTime.length > 0) {
-          params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
-          params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
-        } else {
-          params.beginDate = ''
-          params.endDate = ''
-        }
-        this.exportLoading = true
-        customerBundleExportDelay(params).then(res => {
-          this.exportLoading = false
-          this.download(res)
+      exportLoading: false, // 导出loading
+      disabled: false, //  查询、重置按钮是否可操作
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'memsentPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'memendtPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'tostalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', scopedSlots: { customRender: 'outOfStockNum' }, width: 150, align: 'center' },
+        { title: '盈亏数量', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
         })
       },
-      download (data) {
-        if (!data) { return }
-        const url = window.URL.createObjectURL(new Blob([data]))
-        const link = document.createElement('a')
-        link.style.display = 'none'
-        link.href = url
-        const a = moment().format('YYYYMMDDHHmmss')
-        const fname = '仓库调拨' + a
-        link.setAttribute('download', fname + '.xlsx')
-        document.body.appendChild(link)
-        link.click()
+      typeData: []
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+    },
+    //  导入
+    handleImport () {},
+    //  下载导入模板
+    handleDownImport () {},
+    //  提交
+    handleSubmit () {},
+    //  重置
+    resetSearchForm () {},
+    //  导出
+    handleExport () {
+      const params = this.queryParam
+      if (this.oldTime && this.oldTime.length > 0) {
+        params.beginOldExpiryDate = moment(this.oldTime[0]).format('YYYY-MM-DD')
+        params.endOldExpirydDate = moment(this.oldTime[1]).format('YYYY-MM-DD')
+      } else {
+        params.beginOldExpiryDate = ''
+        params.endOldExpirydDate = ''
+      }
+      if (this.newTime && this.newTime.length > 0) {
+        params.beginDate = moment(this.newTime[0]).format('YYYY-MM-DD')
+        params.endDate = moment(this.newTime[1]).format('YYYY-MM-DD')
+      } else {
+        params.beginDate = ''
+        params.endDate = ''
       }
+      this.exportLoading = true
+      customerBundleExportDelay(params).then(res => {
+        this.exportLoading = false
+        this.download(res)
+      })
+    },
+    download (data) {
+      if (!data) { return }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      const a = moment().format('YYYYMMDDHHmmss')
+      const fname = '仓库调拨' + a
+      link.setAttribute('download', fname + '.xlsx')
+      document.body.appendChild(link)
+      link.click()
     }
   }
+}
 </script>
 
 <style lang="less">

+ 2 - 2
src/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue

@@ -11,7 +11,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="makeInventoryDetail-cont">
+    <a-card size="small" :bordered="false" class="makeInventoryDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -23,7 +23,7 @@
       </a-collapse>
     </a-card>
     <!-- 详情 -->
-    <a-card :bordered="false" class="makeInventoryDetail-cont">
+    <a-card size="small" :bordered="false" class="makeInventoryDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="详情">
           <!-- 总计 -->

+ 46 - 39
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -1,29 +1,37 @@
 <template>
-  <a-card :bordered="false" class="inventoryCheckingOverall-wrap">
-    <!-- 操作按钮 -->
-    <div class="table-operator">
-      <a-checkbox-group @change="onChange" v-model="queryParam.keyword" :disabled="disabled" id="inventoryCheckingOverall-type">
-        <a-checkbox value="A">不含废品仓</a-checkbox>
-        <a-checkbox value="B">有库存</a-checkbox>
-        <a-checkbox value="C">库存合并</a-checkbox>
-      </a-checkbox-group>
-    </div>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="default"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :showPagination="false"
-      bordered>
-    </s-table>
-    <div class="btn-cont">
-      <a-button type="primary" id="inventoryChecking-overall-submit" @click="handleSubmit">提交</a-button>
-      <a-button id="inventoryChecking-overall-back" @click="handleBack" style="margin-left: 15px;">返回列表</a-button>
-    </div>
-  </a-card>
+  <div class="inventoryCheckingOverall-wrap">
+    <a-page-header :ghost="false" @back="handleBack" class="inventoryCheckingOverall-back">
+      <!-- 自定义的二级文字标题 -->
+      <template slot="subTitle">
+        <a id="inventoryChecking-overall-submit" href="javascript:;" @click="handleBack">返回列表</a>
+      </template>
+    </a-page-header>
+    <a-card size="small" :bordered="false" class="inventoryCheckingOverall-cont">
+      <!-- 操作按钮 -->
+      <div class="table-operator">
+        <a-checkbox-group @change="onChange" v-model="queryParam.keyword" :disabled="disabled" id="inventoryCheckingOverall-type">
+          <a-checkbox value="A">不含废品仓</a-checkbox>
+          <a-checkbox value="B">有库存</a-checkbox>
+        </a-checkbox-group>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :showPagination="false"
+        bordered>
+      </s-table>
+    </a-card>
+    <a-affix :offset-bottom="0">
+      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
+        <a-button type="primary" id="inventoryChecking-overall-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+      </div>
+    </a-affix>
+  </div>
 </template>
 
 <script>
@@ -34,7 +42,7 @@ export default {
   data () {
     return {
       queryParam: { //  查询条件
-        keyword: [],  //  
+        keyword: [] //
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -42,7 +50,7 @@ export default {
         { title: '产品编码', dataIndex: 'createDate', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'nsso', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'no3', width: 70, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'n4o', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'n4o', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -53,7 +61,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -68,21 +76,21 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
-      
+      }
+
     }
   },
   methods: {
     //  提交
-    handleSubmit(){
-      
+    handleSubmit () {
+
     },
     //  返回
-    handleBack(){
+    handleBack () {
       this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
     },
-    //  
-    onChange(){},
+    //
+    onChange () {}
   }
 }
 </script>
@@ -93,9 +101,8 @@ export default {
     .table-operator{
       margin-bottom: 25px;
     }
-    .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
+    .inventoryCheckingOverall-cont, .inventoryCheckingOverall-back{
+      margin-bottom: 15px;
     }
   }
-</style>
+</style>

+ 182 - 150
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -7,7 +7,7 @@
       </template>
     </a-page-header>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="selfDisk-cont">
+    <a-card size="small" :bordered="false" class="selfDisk-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">选择产品</template>
@@ -24,7 +24,14 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品品牌">
-                      <a-select placeholder="请选择" id="selfDisk-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                      <a-select
+                        placeholder="请选择"
+                        id="selfDisk-state"
+                        allowClear
+                        v-model="queryParam.dataSourceNo"
+                        :showSearch="true"
+                        option-filter-prop="children"
+                        :filter-option="filterOption">
                         <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -37,21 +44,42 @@
                   <template v-if="advanced">
                     <a-col :md="6" :sm="24">
                       <a-form-item label="库存">
-                        <a-select placeholder="请选择" id="selfDisk-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                        <a-select
+                          placeholder="请选择"
+                          id="selfDisk-state"
+                          allowClear
+                          v-model="queryParam.dataSourceNo"
+                          :showSearch="true"
+                          option-filter-prop="children"
+                          :filter-option="filterOption">
                           <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                         </a-select>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="仓库">
-                        <a-select placeholder="请选择" id="selfDisk-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                        <a-select
+                          placeholder="请选择"
+                          id="selfDisk-state"
+                          allowClear
+                          v-model="queryParam.dataSourceNo"
+                          :showSearch="true"
+                          option-filter-prop="children"
+                          :filter-option="filterOption">
                           <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                         </a-select>
                       </a-form-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-item label="仓位">
-                        <a-select placeholder="请选择" id="selfDisk-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                        <a-select
+                          placeholder="请选择"
+                          id="selfDisk-state"
+                          allowClear
+                          v-model="queryParam.dataSourceNo"
+                          :showSearch="true"
+                          option-filter-prop="children"
+                          :filter-option="filterOption">
                           <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                         </a-select>
                       </a-form-item>
@@ -76,10 +104,11 @@
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
+              :scroll="{ x: 1420 }"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleAdd(record)" id="selfDisk-add-btn">添加</a-button>
+                <a-button size="small" type="link" @click="handleAdd(record)" id="selfDisk-add-btn">添加</a-button>
               </template>
             </s-table>
           </div>
@@ -87,7 +116,7 @@
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="selfDisk-cont">
+    <a-card size="small" :bordered="false" class="selfDisk-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -108,10 +137,11 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
+              :scroll="{ x: 1420 }"
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="selfDisk-del-btn">删除</a-button>
+                <a-button size="small" type="link" @click="handleDel(record)" id="selfDisk-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>
@@ -127,156 +157,158 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        advanced: false,  //  高级搜索 展开/关闭
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品品牌', dataIndex: 'custssName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品级别', dataIndex: 'custsdName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓库', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '仓位', dataIndex: 'totalNsums', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'storageQuantity', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '最后入库时间', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
-          { title: '产品名称', dataIndex: 'custName', align: 'center' },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center' },
-          { title: '产品品牌', dataIndex: 'custsNasme', align: 'center' },
-          { title: '产品级别', dataIndex: 'custsNdme', align: 'center' },
-          { title: '仓库', dataIndex: 'totalNums', align: 'center' },
-          { title: '仓位', dataIndex: 'totalNsums', align: 'center' },
-          { title: '库存数量', dataIndex: 'storageQuantity', align: 'center' },
-          { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '最后入库时间', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
-                { id: '2', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
-                { id: '3', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  提交
-      handleSubmit(){},
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  基本信息  保存
-      handleOk(){
-        
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+
       },
-      //  导入明细
-      handleImport(){
-        console.log(333)
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      advanced: false, //  高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'custssName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品级别', dataIndex: 'custsdName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'totalNsums', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'storageQuantity', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '最后入库时间', scopedSlots: { customRender: 'purchaseNum' }, width: 160, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
+      // 表头
+      chooseColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'custName', align: 'center' },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center' },
+        { title: '产品品牌', dataIndex: 'custsNasme', width: 100, align: 'center' },
+        { title: '产品级别', dataIndex: 'custsNdme', width: 100, align: 'center' },
+        { title: '仓库', dataIndex: 'totalNums', width: 100, align: 'center' },
+        { title: '仓位', dataIndex: 'totalNsums', width: 100, align: 'center' },
+        { title: '库存数量', dataIndex: 'storageQuantity', width: 100, align: 'center' },
+        { title: '单位', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '最后入库时间', scopedSlots: { customRender: 'purchaseNum' }, width: 160, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
+              { id: '2', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' },
+              { id: '3', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      filterOption(input, option) {
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  提交
+    handleSubmit () {},
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  导入明细
+    handleImport () {
+      console.log(333)
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/inventoryManagement/inventoryChecking/list' })
+    },
+    filterOption (input, option) {
       	return (
       		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       	)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
+}
 </script>
 
 <style lang="less">

+ 0 - 148
src/views/inventoryManagement/inventoryChecking/supervisionAudit.vue

@@ -1,148 +0,0 @@
-<template>
-  <div class="supervisionAudit-wrap">
-    <a-page-header :ghost="false" @back="handleBack" class="supervisionAudit-back">
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="supervisionAudit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <template slot="extra">
-        <a-button key="1" type="primary" id="supervisionAudit-print-btn">快速打印</a-button>
-      </template>
-    </a-page-header>
-    <!-- 详情 -->
-    <a-card :bordered="false" class="supervisionAudit-cont">
-      <!-- 筛选条件 -->
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="supervisionAudit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="supervisionAudit-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="产品类别">
-                <a-cascader :options="typeData" id="supervisionAudit-state" placeholder="请选择产品类别" allowClear v-model="queryParam.brand" />
-              </a-form-item>
-            </a-col>
-            <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="类型">
-                  <a-select placeholder="请选择" id="supervisionAudit-state" allowClear v-model="queryParam.dataSourceNo">
-                    <a-select-option v-for="item in typeData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-            </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionAudit-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="supervisionAudit-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="default"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        bordered>
-      </s-table>
-    </a-card>
-    <a-affix :offset-bottom="0">
-      <div style="text-align: center;width: 100%;background-color: #fff;padding: 30px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="supervisionAudit-submit" size="large" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
-        <a-button type="danger" id="supervisionAudit-again" size="large" @click="handleAgain" style="padding: 0 60px;margin-left: 60px;">重新盘点</a-button>
-      </div>
-    </a-affix>
-  </div>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          dataSourceNo: undefined
-        },
-        exportLoading: false, // 导出loading
-        disabled: false, //  查询、重置按钮是否可操作
-        advanced: false,  //  高级搜索 展开/关闭
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盘点数量', dataIndex: 'tossstalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盈亏数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        typeData: []
-      }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
-      },
-      //  提交
-      handleSubmit(){},
-      //  重新盘点
-      handleAgain(){},
-      //  重置
-      resetSearchForm(){},
-    }
-  }
-</script>
-
-<style lang="less">
-  .supervisionAudit-cont, .supervisionAudit-back{
-    margin-bottom: 15px;
-  }
-</style>

+ 0 - 144
src/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue

@@ -1,144 +0,0 @@
-<template>
-  <div class="supervisionAuditDetail-wrap">
-    <a-page-header :ghost="false" @back="handleBack" class="supervisionAuditDetail-back">
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="supervisionAuditDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <template slot="extra">
-        <a-button key="1" type="primary" id="supervisionAuditDetail-print-btn">快速打印</a-button>
-      </template>
-    </a-page-header>
-    <!-- 基础信息 -->
-    <a-card :bordered="false" class="supervisionAuditDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="盘点单号">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="监盘审核状态">箭冠营销中心</a-descriptions-item>
-            <a-descriptions-item label="完结状态">箭冠营销中心</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 详情 -->
-    <a-card :bordered="false" class="supervisionAuditDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="详情">
-          <!-- 总计 -->
-          <a-alert type="info" showIcon style="margin-bottom:15px">
-            <div slot="message">库存总款数: <strong>6</strong> ,库存总数量: <strong>6</strong> ,盈亏数量: <strong>6</strong></div>
-          </a-alert>
-          <!-- 筛选条件 -->
-          <div class="table-page-search-wrapper">
-            <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-              <a-row :gutter="15">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="类型">
-                    <a-select placeholder="请选择" id="supervisionAuditDetail-type" allowClear v-model="queryParam.dataSourceNo">
-                      <a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
-                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supervisionAuditDetail-refresh">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="supervisionAuditDetail-reset">重置</a-button>
-                </a-col>
-              </a-row>
-            </a-form>
-          </div>
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="default"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            bordered>
-            <!-- 采购数量 -->
-            <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
-            </template>
-            <!-- 缺货数量 -->
-            <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
-            </template>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-  </div>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          dataSourceNo: undefined
-        },
-        exportLoading: false, // 导出loading
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '库存数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '盘点数量', dataIndex: 'tostalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '盈亏数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        brandData: []
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm(){},
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/inventoryManagement/inventoryChecking/list'})
-      },
-    }
-  }
-</script>
-
-<style lang="less">
-  .supervisionAuditDetail-cont, .supervisionAuditDetail-back{
-    margin-bottom: 15px;
-  }
-</style>

+ 18 - 19
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -16,8 +16,12 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      bordered></s-table>
-    <div class="btn-cont"><a-button id="inventoryQueryDetail-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
+      :scroll="{ x: 1220 }"
+      bordered>
+    </s-table>
+    <div class="btn-cont">
+      <a-button id="inventoryQueryDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
+    </div>
   </a-modal>
 </template>
 
@@ -46,16 +50,16 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 170, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 170, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'productType', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'productTypes', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '入库类型', dataIndex: 'productTypess', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', dataIndex: 'inventoryNum', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本单价', dataIndex: 'inventoryMoney', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库时间', dataIndex: 'productBrand', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'productType', width: 100, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'productTypes', width: 100, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '入库类型', dataIndex: 'productTypess', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'inventoryNum', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本单价', dataIndex: 'inventoryMoney', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -70,7 +74,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -89,7 +93,7 @@ export default {
     }
   },
   methods: {
-    
+
   },
   watch: {
     //  父页面传过来的弹框状态
@@ -116,11 +120,6 @@ export default {
 
 <style lang="less">
   .inventoryQueryDetail-modal{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
     .btn-cont {
     	text-align: center;
     	margin: 35px 0 10px;

+ 15 - 23
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="inventoryQueryList-wrap">
+  <a-card size="small" :bordered="false" class="inventoryQueryList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -62,11 +62,13 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1370 }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="goDetail(record)" id="inventoryQueryList-detail-btn" style="margin: 0 0 8px 0;">库存详情</a-button>
-        <a-button size="small" style="margin-left: 8px" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+        <a-button size="small" type="link" @click="goDetail(record)" id="inventoryQueryList-detail-btn">库存详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" style="margin-left: 8px" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
       </template>
     </s-table>
     <!-- 库存详情 -->
@@ -97,15 +99,15 @@ export default {
       brandData: [],  //  产品品牌下拉数据
       typeData: [],  //  产品类别下拉数据
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'brandName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '现有库存数量(个)', dataIndex: 'currentStockQty', width: 180, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '现有库存成本(¥)', dataIndex: 'currentStockCost', width: 180, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'brandName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '现有库存数量(个)', dataIndex: 'currentStockQty', width: 165, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '现有库存成本(¥)', dataIndex: 'currentStockCost', width: 165, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -173,14 +175,4 @@ export default {
     }
   }
 }
-</script>
-
-<style lang="less">
-  .inventoryQueryList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
-  }
-</style>
+</script>

+ 30 - 34
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -6,7 +6,7 @@
         <a id="inventoryQueryWarehouseDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
     </a-page-header>
-    <a-card :bordered="false" class="inventoryQueryWarehouseDetail-cont">
+    <a-card size="small" :bordered="false" class="inventoryQueryWarehouseDetail-cont">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -36,13 +36,13 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据审核时间">
                   <a-range-picker
-                      style="width:100%"
-                      id="inventoryQueryWarehouseDetail-bundleNamesss"
-                      :disabledDate="disabledDate"
-                      v-model="queryParam.brand"
-                      :format="dateFormat"
-                      :placeholder="['开始时间', '结束时间']" />
-                  </a-form-item>
+                    style="width:100%"
+                    id="inventoryQueryWarehouseDetail-bundleNamesss"
+                    :disabledDate="disabledDate"
+                    v-model="queryParam.brand"
+                    :format="dateFormat"
+                    :placeholder="['开始时间', '结束时间']" />
+                </a-form-item>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -75,10 +75,11 @@
         :columns="columns"
         :data="loadData"
         :showPagination="false"
+        :scroll="{ x: 1760 }"
         bordered>
         <!-- 数量 -->
         <template slot="number" slot-scope="text, record">
-          <span :class="[record.type == 1 ? 'green' : 'red']">{{record.type == 1 ? '+' : '-'}}{{record.number}}</span>
+          <span :class="[record.type == 1 ? 'green' : 'red']">{{ record.type == 1 ? '+' : '-' }}{{ record.number }}</span>
         </template>
       </s-table>
     </a-card>
@@ -92,7 +93,7 @@ export default {
   components: { STable },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
         orderBundle: {
@@ -100,28 +101,28 @@ export default {
         },
         bundleName: '', //  套餐名称
         itemName: '', //  服务名称
-        brand: undefined,  //  产品品牌
-        inventoryNum: false  //  库存数量是否为0
+        brand: undefined, //  产品品牌
+        inventoryNum: false //  库存数量是否为0
       },
       exportLoading: false, // 导出loading
       disabled: false, //  查询、重置按钮是否可操作
-      brandData: [],  //  产品品牌下拉数据
-      typeData: [],  //  产品类别下拉数据
+      brandData: [], //  产品品牌下拉数据
+      typeData: [], //  产品类别下拉数据
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库批次时间', dataIndex: 'prodsuctBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据类型', dataIndex: 'productBdrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据审核时间', dataIndex: 'prodfuctBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'productNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库批次时间', dataIndex: 'prodsuctBrand', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'productBdrand', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据审核时间', dataIndex: 'prodfuctBrand', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'produhctBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'productBrangd', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'productBjrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '数量', scopedSlots: { customRender: 'number' }, width: 180, align: 'center' },
-        { title: '总成本', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'inventoryMoneys', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', dataIndex: 'productBrangd', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'productBjrand', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '数量', scopedSlots: { customRender: 'number' }, width: 100, align: 'center' },
+        { title: '总成本', dataIndex: 'inventoryMoney', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'inventoryMoneys', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -136,7 +137,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -170,7 +171,7 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  返回列表
-    handleBack(){
+    handleBack () {
       this.$router.push({ path: '/inventoryManagement/inventoryQuery/list' })
     }
   }
@@ -179,11 +180,6 @@ export default {
 
 <style lang="less">
   .inventoryQueryWarehouseDetail-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
     .inventoryQueryWarehouseDetail-back{
       margin-bottom: 15px;
     }
@@ -197,4 +193,4 @@ export default {
       color: #ed1c24;
     }
   }
-</style>
+</style>

+ 42 - 41
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="inventoryWarningList-wrap">
+  <a-card size="small" :bordered="false" class="inventoryWarningList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -43,7 +43,13 @@
           <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryWarningList-refresh">查询</a-button>
             <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryWarningList-reset">重置</a-button>
-            <a-button style="margin-left: 8px" type="danger" @click="handleExport" :disabled="disabled" :loading="exportLoading" id="inventoryWarningList-export">导出</a-button>
+            <a-button
+              style="margin-left: 8px"
+              type="danger"
+              @click="handleExport"
+              :disabled="disabled"
+              :loading="exportLoading"
+              id="inventoryWarningList-export">导出</a-button>
             <a @click="advanced=!advanced" style="margin-left: 8px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -66,7 +72,7 @@
       :dataSource="loadData"
       :pagination="paginationProps"
       :loading="loadingPage"
-      :scroll="{ x: 2210 }"
+      :scroll="{ x: 1940 }"
       bordered>
       <!-- 预警提示 -->
       <template slot="warningTips" slot-scope="text, record">
@@ -135,7 +141,7 @@
             </a-popconfirm>
           </span>
           <span v-else>
-            <a-button size="small" type="primary" :disabled="editingId !== ''" @click="() => edit(record.id)">编辑</a-button type="primary">
+            <a-button size="small" type="link" :disabled="editingId !== ''" @click="() => edit(record.id)">编辑</a-button type="primary">
           </span>
         </div>
       </template>
@@ -151,7 +157,7 @@ export default {
   components: { STable },
   data () {
     return {
-      advanced: false,  // 高级搜索 展开/关闭
+      advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
         orderBundle: {
@@ -159,29 +165,29 @@ export default {
         },
         bundleName: '', //  套餐名称
         itemName: '', //  服务名称
-        brand: undefined,  //  产品品牌
-        inventoryNum: false  //  库存数量是否为0
+        brand: undefined, //  产品品牌
+        inventoryNum: false //  库存数量是否为0
       },
       exportLoading: false, // 导出loading
       disabled: false, //  查询、重置按钮是否可操作
-      brandData: [],  //  产品品牌下拉数据
-      typeData: [],  //  产品类别下拉数据  160 * 3 + 200 * 2 + 100 + 140 * 5 + 120 * 3 
+      brandData: [], //  产品品牌下拉数据
+      typeData: [], //  产品类别下拉数据
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'productNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '级别', dataIndex: 'productNasme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productBrand', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '实时库存数(个)', dataIndex: 'inventoryRealTime', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '在途数(个)', scopedSlots: { customRender: 'onWayNum' }, width: 150, align: 'center' },
-        { title: '总库存数(个)', dataIndex: 'inventoryTotal', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '最大库存数(个)', scopedSlots: { customRender: 'maxInventory' }, width: 150, align: 'center' },
-        { title: '最小库存数(个)', scopedSlots: { customRender: 'minInventory' }, width: 150, align: 'center' },
-        { title: '差异数量', dataIndex: 'variabilityMeasures', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '预警提示', scopedSlots: { customRender: 'warningTips' }, width: 120, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center', fixed: 'right' }
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrand', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '实时库存数(个)', dataIndex: 'inventoryRealTime', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '在途数(个)', scopedSlots: { customRender: 'onWayNum' }, width: 130, align: 'center' },
+        { title: '总库存数(个)', dataIndex: 'inventoryTotal', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '最大库存数(个)', scopedSlots: { customRender: 'maxInventory' }, width: 130, align: 'center' },
+        { title: '最小库存数(个)', scopedSlots: { customRender: 'minInventory' }, width: 130, align: 'center' },
+        { title: '差异数量', dataIndex: 'variabilityMeasures', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '预警提示', scopedSlots: { customRender: 'warningTips' }, width: 100, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       // loadData: parameter => {
@@ -258,8 +264,8 @@ export default {
           minInventory: 1,
           variabilityMeasures: 2
         }
-      ],  //  列表数据
-      loadingPage: false,  //  加载中
+      ], //  列表数据
+      loadingPage: false, //  加载中
       pageNo: 1, //  分页页码
       pageSize: 10, //  分页 每页多少条
       paginationProps: {
@@ -269,8 +275,8 @@ export default {
         onShowSizeChange: (current, pageSize) => this.changePageSize(current, pageSize),
         onChange: (current) => this.changePage(current)
       },
-      openModal: false,  //  查看库存详情  弹框
-      itemId: '',  //  当前库存记录id
+      openModal: false, //  查看库存详情  弹框
+      itemId: '', //  当前库存记录id
       editingId: ''
     }
   },
@@ -329,14 +335,14 @@ export default {
       this.pageInit(1)
     },
     //  批量更新
-    handleupdate(){
+    handleupdate () {
       const _this = this
       this.$confirm({
         title: '提示',
         content: '确定提交批量更新的内容吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           // delectRolePower({
           //   id: row.id
@@ -351,7 +357,7 @@ export default {
       })
     },
     //  change
-    handleChange(value, id, column) {
+    handleChange (value, id, column) {
       const newData = [...this.loadData]
       const target = newData.filter(item => id === item.id)[0]
       if (target) {
@@ -360,7 +366,7 @@ export default {
       }
     },
     //  编辑
-    edit(id) {
+    edit (id) {
       const newData = [...this.loadData]
       const target = newData.filter(item => id === item.id)[0]
       this.editingId = id
@@ -370,7 +376,7 @@ export default {
       }
     },
     //  保存
-    save(id, onWayNum, maxInventory, minInventory) {
+    save (id, onWayNum, maxInventory, minInventory) {
       //  更改后的值是否为空
       if (!onWayNum) {
         this.$message.warning('在途数不能为空')
@@ -389,15 +395,15 @@ export default {
       //   accountPrice: accountPrice
       // }).then(res => {
       //   if (res.status == 200) {
-          this.editingId = ''
-          this.pageInit()
+      this.editingId = ''
+      this.pageInit()
       //   } else {
       //     this.$message.warning(res.message)
       //   }
       // })
     },
     //  取消
-    cancel(id) {
+    cancel (id) {
       const newData = [...this.loadData]
       const target = newData.filter(item => id === item.id)[0]
       this.editingId = ''
@@ -433,11 +439,6 @@ export default {
 
 <style lang="less">
   .inventoryWarningList-wrap{
-    .sTable{
-      table{
-        width: auto;
-      }
-    }
     .green{
       color: #19be6b;
     }
@@ -451,4 +452,4 @@ export default {
       color: #2db7f5;
     }
   }
-</style>
+</style>

+ 55 - 38
src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue

@@ -10,7 +10,7 @@
     width="80%">
     <!-- 补货清单 -->
     <div>
-      <h2>车领主常青二路店</h2>
+      <h3 style="font-weight: bold;">车领主常青二路店</h3>
       <s-table
         class="sTable"
         ref="table"
@@ -18,16 +18,36 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1260 }"
         bordered>
         <!-- 补货数量 -->
         <template slot="inventoryNumss" slot-scope="text, record">
-          <a-button type="primary" @click="handleNumSubtract" shape="circle" icon="minus" size="small" id="satelliteWarehouseInventoryList-num-add-btn"></a-button>
-          <a-input-number v-model="val" :min="0" :max="999999" :precision="0" :step="1" @change="onChange" class="stepper" />
-          <a-button type="primary" @click="handleNumAdd" shape="circle" icon="plus" size="small" id="satelliteWarehouseInventoryList-num-subtract-btn"></a-button>
+          <a-button
+            type="primary"
+            @click="handleNumSubtract"
+            shape="circle"
+            icon="minus"
+            size="small"
+            id="satelliteWarehouseInventoryList-num-add-btn"></a-button>
+          <a-input-number
+            v-model="val"
+            :min="0"
+            :max="999999"
+            :precision="0"
+            :step="1"
+            @change="onChange"
+            class="stepper" />
+          <a-button
+            type="primary"
+            @click="handleNumAdd"
+            shape="circle"
+            icon="plus"
+            size="small"
+            id="satelliteWarehouseInventoryList-num-subtract-btn"></a-button>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button type="danger" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移除</a-button>
+          <a-button type="link" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移除</a-button>
         </template>
       </s-table>
       <div class="btn-cont">
@@ -53,14 +73,14 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '仓库名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true },
-        { title: '配件名称', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true },
-        { title: '产品编码', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品原厂编码', dataIndex: 'productTyspe', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '补货数量', scopedSlots: { customRender: 'inventoryNumss' }, width: 280, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '客户名称', dataIndex: 'productName', align: 'center', ellipsis: true },
+        { title: '仓库名称', dataIndex: 'productBrand', align: 'center', ellipsis: true },
+        { title: '配件名称', dataIndex: 'productOldNum', align: 'center', ellipsis: true },
+        { title: '产品编码', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品原厂编码', dataIndex: 'productTyspe', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补货数量', scopedSlots: { customRender: 'inventoryNumss' }, width: 200, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -75,7 +95,7 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
@@ -96,25 +116,25 @@ export default {
   },
   methods: {
     //  获取详情
-    getDetail(){
-      
+    getDetail () {
+
     },
     //  创建销售单
-    handleAdd(){},
+    handleAdd () {},
     //  补货数量  加
-    handleNumAdd(){
+    handleNumAdd () {
       this.val < 999999 ? this.val++ : this.val
     },
     //  补货数量  减
-    handleNumSubtract(row){
+    handleNumSubtract (row) {
       this.val > 1 ? this.val-- : this.handleRemove(row)
     },
     //  删除配件信息
-    handleRemove(row){
+    handleRemove (row) {
       console.log('删除')
     },
     //  补货数量  change
-    onChange(val){
+    onChange (val) {
       console.log(val)
     }
   },
@@ -137,30 +157,27 @@ export default {
   .satelliteWarehouseInventory-modal{
     .sTable{
       margin-top: 20px;
-      table{
-        width: auto;
-      }
     }
     .ant-modal-body {
-    	padding: 40px 40px 24px;
+      padding: 40px 40px 24px;
     }
     .item-cont {
-    	margin-bottom: 15px;
-    	display: flex;
-    	.item-label {
-    		width: 115px;
-    		font-size: 14px;
-    		color: rgba(0, 0, 0, 0.85);
-    		flex-shrink: 0;
-    	}
-    	.item-main {
-    		flex-grow: 1;
+      margin-bottom: 15px;
+      display: flex;
+      .item-label {
+        width: 115px;
+        font-size: 14px;
+        color: rgba(0, 0, 0, 0.85);
+        flex-shrink: 0;
+      }
+      .item-main {
+        flex-grow: 1;
         word-break: break-all;
-    	}
+      }
     }
     .btn-cont {
-    	text-align: center;
-    	margin: 35px 0 10px;
+      text-align: center;
+      margin: 35px 0 10px;
     }
     .stepper{
       margin: 0 10px;

+ 161 - 156
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -1,182 +1,187 @@
 <template>
-	<a-card :bordered="false" class="satelliteWarehouseInventoryList-wrap">
-		<!-- 搜索条件 -->
-		<div class="table-page-search-wrapper">
-			<a-form-model
-				id="satelliteWarehouseInventoryList-form"
-				ref="ruleForm"
-				:model="queryParam"
-				:rules="rules"
-				:labelCol="labelCol"
-				:wrapperCol="wrapperCol"
-				@keyup.enter.native="$refs.table.refresh(true)" >
-				<a-row :gutter="15">
-					<a-col :md="6" :sm="24">
-						<a-form-model-item label="客户名称" prop="customer">
-							<a-select
-								placeholder="请选择客户"
-								allowClear
-								v-model="queryParam.customer"
-								:showSearch="true"
-								option-filter-prop="children"
-								:filter-option="filterOption"
-							>
-								<a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-							</a-select>
-						</a-form-model-item>
-					</a-col>
-					<a-col :md="6" :sm="24">
-						<a-form-model-item label="配件名称">
-							<a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入配件名称" />
-						</a-form-model-item>
-					</a-col>
-					<a-col :md="6" :sm="24">
-						<a-form-model-item label="配件编码">
-							<a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码或产品原厂编码" />
-						</a-form-model-item>
-					</a-col>
-					<a-col :md="6" :sm="24">
-						<a-button type="primary" @click="handleSearch" :disabled="disabled" id="satelliteWarehouseInventoryList-refresh" style="margin-top: 4px">
-							查询
-						</a-button>
-						<a-button @click="resetSearchForm" :disabled="disabled" id="satelliteWarehouseInventoryList-reset" style="margin: 4px 0 0 8px">重置</a-button>
-					</a-col>
-				</a-row>
-			</a-form-model>
-		</div>
-		<!-- 操作按钮 -->
-		<div class="table-operator">
+  <a-card size="small" :bordered="false" class="satelliteWarehouseInventoryList-wrap">
+    <!-- 搜索条件 -->
+    <div class="table-page-search-wrapper">
+      <a-form-model
+        id="satelliteWarehouseInventoryList-form"
+        ref="ruleForm"
+        :model="queryParam"
+        :rules="rules"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        @keyup.enter.native="$refs.table.refresh(true)" >
+        <a-row :gutter="15">
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="客户名称" prop="customer">
+              <a-select
+                placeholder="请选择客户"
+                allowClear
+                v-model="queryParam.customer"
+                :showSearch="true"
+                option-filter-prop="children"
+                :filter-option="filterOption"
+              >
+                <a-select-option v-for="item in brandData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="配件名称">
+              <a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入配件名称" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-form-model-item label="配件编码">
+              <a-input id="satelliteWarehouseInventoryList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入产品编码或产品原厂编码" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="satelliteWarehouseInventoryList-refresh" style="margin-top: 4px">
+              查询
+            </a-button>
+            <a-button @click="resetSearchForm" :disabled="disabled" id="satelliteWarehouseInventoryList-reset" style="margin: 4px 0 0 8px">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </div>
+    <!-- 操作按钮 -->
+    <div class="table-operator">
       <a-button id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">
         补货清单
-        <span v-if="checkedList.length>0">({{checkedList.length}})</span>
+        <span v-if="checkedList.length>0">({{ checkedList.length }})</span>
       </a-button>
     </div>
-		<!-- 列表 -->
-		<s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
-			<!-- 操作 -->
-			<template slot="action" slot-scope="text, record">
-        <a-button size="small" type="danger" v-if="checkedList.indexOf(record.id) != -1" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移出补货清单</a-button>
-				<a-button size="small" type="primary" v-else @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="record => record.id"
+      :columns="columns"
+      :data="loadData"
+      bordered>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="link" v-if="checkedList.indexOf(record.id) != -1" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移出补货清单</a-button>
+        <a-button size="small" type="link" v-else @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
       </template>
-		</s-table>
-		<!-- 客户详情 -->
-		<satellite-warehouse-inventory-add-modal :openModal="openModal" @close="closeModal" />
-	</a-card>
+    </s-table>
+    <!-- 客户详情 -->
+    <satellite-warehouse-inventory-add-modal :openModal="openModal" @close="closeModal" />
+  </a-card>
 </template>
 
 <script>
 // import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
-import { STable, VSelect } from '@/components';
-import satelliteWarehouseInventoryAddModal from './addModal.vue';
+import { STable, VSelect } from '@/components'
+import satelliteWarehouseInventoryAddModal from './addModal.vue'
 export default {
-	components: { STable, VSelect, satelliteWarehouseInventoryAddModal },
-	data() {
-		return {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 16 },
-			queryParam: {
-				//  查询条件
-				customer: undefined, //  客户名称
-				bundleName: '', //  套餐名称
-				itemName: '', //  服务名称
-				brand: undefined //  产品品牌
-			},
-			rules: {
-				customer: [{ required: true, message: '请输入客户名称', trigger: 'blur' }]
-			},
-			disabled: false, //  查询、重置按钮是否可操作
-			brandData: [], //  产品品牌下拉数据
-			columns: [
-				{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-				{ title: '客户名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-				{ title: '配件名称', dataIndex: 'productBrand', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-				{ title: '产品编码', dataIndex: 'productOldNum', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '原厂编码', dataIndex: 'productType', align: 'center', customRender: function (text) { return text || '--' } },
-				{ title: '当前库存', dataIndex: 'inventoryNumss', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-				{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-			],
-			// 加载数据方法 必须为 Promise 对象
-			loadData: parameter => {
-				this.disabled = true;
-				// return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-				//   const data = res.data
-				//   const no = (data.pageNo - 1) * data.pageSize
-				//   for (var i = 0; i < data.list.length; i++) {
-				//     data.list[i].no = no + i + 1
-				//   }
-				//   this.disabled = false
-				//   return data
-				// })
-				const _this = this
-				return new Promise(function(resolve, reject) {
-					const data = {
-						pageNo: 1,
-						pageSize: 10,
-						list: [
-							{ id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
-							{ id: '2', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
-							{ id: '3', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
-						]
-					};
-					const no = (data.pageNo - 1) * data.pageSize;
-					for (var i = 0; i < data.list.length; i++) {
-						data.list[i].no = no + i + 1;
-					}
-					_this.disabled = false;
-					resolve(data);
-				})
-			},
-			openModal: false, //  查看客户详情  弹框
-      checkedList: []  //  加入补货单数据
-		};
-	},
-	methods: {
-		// 不可选日期
-		disabledDate (date, dateStrings) {
-			return date && date.valueOf() > Date.now()
-		},
+  components: { STable, VSelect, satelliteWarehouseInventoryAddModal },
+  data () {
+    return {
+      labelCol: { span: 8 },
+      wrapperCol: { span: 16 },
+      queryParam: {
+        //  查询条件
+        customer: undefined, //  客户名称
+        bundleName: '', //  套餐名称
+        itemName: '', //  服务名称
+        brand: undefined //  产品品牌
+      },
+      rules: {
+        customer: [{ required: true, message: '请输入客户名称', trigger: 'blur' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      brandData: [], //  产品品牌下拉数据
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '客户名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '配件名称', dataIndex: 'productBrand', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productOldNum', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productType', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '当前库存', dataIndex: 'inventoryNumss', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
+              { id: '2', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
+              { id: '3', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' }
+            ]
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      openModal: false, //  查看客户详情  弹框
+      checkedList: [] //  加入补货单数据
+    }
+  },
+  methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
     //  查询
     handleSearch () {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           this.$refs.table.refresh(true)
         } else {
-          console.log('error submit!!');
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
     },
-		//  重置
-		resetSearchForm () {
-			this.queryParam.orderBundleNo = ''
-			this.queryParam.orderBundle.custMobile = ''
-			this.queryParam.bundleName = ''
-			this.queryParam.itemName = ''
-			this.oldTime = undefined
-			this.newTime = undefined
-			this.$refs.table.refresh(true)
-		},
-		//  补货清单
-		handleReplenishment () {
-			this.openModal = true
-		},
-		//  加入补货单
-		handleAdd (row) {
+    //  补货清单
+    handleReplenishment () {
+      this.openModal = true
+    },
+    //  加入补货单
+    handleAdd (row) {
       this.checkedList.indexOf(row.id) == -1 ? this.checkedList.push(row.id) : null
     },
     //  移出补货单
-    handleRemove (row){
+    handleRemove (row) {
       this.checkedList.splice(this.checkedList.indexOf(row.id), 1)
     },
-		//  关闭弹框
-		closeModal () {
-			this.openModal = false
-		},
-		filterOption (input, option) {
-			return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-		}
-	}
+    //  关闭弹框
+    closeModal () {
+      this.openModal = false
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+  }
 }
 </script>
-
-<style lang="less"></style>

+ 9 - 11
src/views/inventoryManagement/warehouse/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="warehouseList-wrap">
+  <a-card size="small" :bordered="false" class="warehouseList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -29,14 +29,13 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 仓位 -->
-      <template slot="storingLocation" slot-scope="text, record">
-        <a-button type="link" @click="goStoringLocation(record)" id="warehouseList-storingLocation-btn">仓位</a-button>
-      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="warehouseList-del-btn" style="margin-left: 15px;">删除</a-button>
+        <a-button size="small" type="link" @click="goStoringLocation(record)" id="warehouseList-storingLocation-btn">仓位管理</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="warehouseList-del-btn" style="margin-left: 10px;">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑仓库 -->
@@ -57,11 +56,10 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '仓库名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓位', scopedSlots: { customRender: 'storingLocation' }, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '排序', dataIndex: 'sort', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 7 - 6
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -6,7 +6,7 @@
         <a id="storingLocationList-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
     </a-page-header>
-    <a-card :bordered="false" class="storingLocationList-cont">
+    <a-card size="small" :bordered="false" class="storingLocationList-cont">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -39,8 +39,9 @@
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
-          <a-button size="small" type="danger" @click="handleDel(record)" id="storingLocationList-del-btn" style="margin-left: 15px;">删除</a-button>
+          <a-button size="small" type="link" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
+          <a-divider type="vertical" style="margin: 0;" />
+          <a-button size="small" type="link" @click="handleDel(record)" id="storingLocationList-del-btn" style="margin-left: 10px;">删除</a-button>
         </template>
       </s-table>
     </a-card>
@@ -63,10 +64,10 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '仓位名称', dataIndex: 'name', align: 'center', ellipsis: true },
-        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+        { title: '排序', dataIndex: 'sort', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/power/OperateJournal/OperateJournal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card size="small" :bordered="false">
     <div class="operateJournal">
       <!-- 搜索框 -->
       <div class="table-page-search-wrapper">

+ 1 - 1
src/views/power/dataDictionary/dataDictionary.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card size="small" :bordered="false">
     <a-row :gutter="24">
       <!-- 左侧字典列表 -->
       <a-col :span="6">

+ 1 - 1
src/views/power/register/register.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card size="small" :bordered="false">
     <a-row :gutter="24">
       <!-- 左侧菜单树列表 -->
       <a-col :span="8">

+ 1 - 1
src/views/power/role/roleList.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card size="small" :bordered="false">
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="48">

+ 1 - 1
src/views/power/user/userList.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card size="small" :bordered="false">
     <div class="table-page-search-wrapper">
       <a-form layout="inline">
         <a-row :gutter="48">

+ 1 - 1
src/views/productManagement/productBrand/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="productBrandList-wrap">
+  <a-card size="small" :bordered="false" class="productBrandList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="productCategoryList-wrap">
+  <a-card size="small" :bordered="false" class="productCategoryList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
       <a-button id="productCategoryList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级分类</a-button>

+ 1 - 1
src/views/productManagement/productInfo/edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="productInfoEdit-table-page-wrapper">
+  <a-card size="small" :bordered="false" class="productInfoEdit-table-page-wrapper">
     <a-form-model
       id="productInfoEdit-form"
       ref="ruleForm"

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="productInfoList-wrap">
+  <a-card size="small" :bordered="false" class="productInfoList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 68 - 67
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -19,7 +19,7 @@
       </template>
     </a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="purchaseOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions :column="3">
@@ -33,7 +33,7 @@
       </a-collapse>
     </a-card>
     <!-- 产品详情 -->
-    <a-card :bordered="false" class="purchaseOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="产品详情">
           <!-- 总计 -->
@@ -48,33 +48,34 @@
             :rowKey="(record) => record.id"
             :columns="columns"
             :data="loadData"
+            :scroll="{ x: 1060 }"
             bordered>
             <!-- 采购数量 -->
             <template slot="purchaseNum" slot-scope="text, record">
-              <span>{{record.purchaseNum}}</span>
+              <span>{{ record.purchaseNum }}</span>
             </template>
             <!-- 缺货数量 -->
             <template slot="outOfStockNum" slot-scope="text, record">
-              <span>{{record.outOfStockNum}}</span>
+              <span>{{ record.outOfStockNum }}</span>
             </template>
           </s-table>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
     <!-- 单据记录 -->
-    <a-card :bordered="false" class="purchaseOrderDetail-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="单据记录">
           <a-timeline class="timeline-box">
-              <a-timeline-item>2021-02-01 15:22:38   王凯   审核通过</a-timeline-item>
-              <a-timeline-item>
-                <p>2021-02-01 15:22:38   王凯   审核通过</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-                <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
-              </a-timeline-item>
-              <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
-              <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
-            </a-timeline>
+            <a-timeline-item>2021-02-01 15:22:38   王凯   审核通过</a-timeline-item>
+            <a-timeline-item>
+              <p>2021-02-01 15:22:38   王凯   审核通过</p>
+              <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
+              <p class="auxiliary-txt">产品编号JA-11076P的采购数量,由【10】修改为【5】</p>
+            </a-timeline-item>
+            <a-timeline-item>Technical testing 2015-09-01</a-timeline-item>
+            <a-timeline-item>Network problems being solved 2015-09-01</a-timeline-item>
+          </a-timeline>
         </a-collapse-panel>
       </a-collapse>
     </a-card>
@@ -82,62 +83,62 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购单价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购金额', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, width: 100, align: 'center' },
+        { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购金额', dataIndex: 'shDate', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       }
-    },
-    methods: {
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
-      },
+    }
+  },
+  methods: {
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
     }
   }
+}
 </script>
 
 <style lang="less">

+ 165 - 147
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -14,12 +14,19 @@
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
-    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
             基础信息
-            <a-button type="primary" shape="circle" size="small" icon="edit" class="edit-circle-btn" id="purchaseOrderEdit-edit-circle-btn" @click.stop="handleEditInfo" />
+            <a-button
+              type="primary"
+              shape="circle"
+              size="small"
+              icon="edit"
+              class="edit-circle-btn"
+              id="purchaseOrderEdit-edit-circle-btn"
+              @click.stop="handleEditInfo" />
           </template>
           <a-descriptions :column="3">
             <a-descriptions-item label="供应商">箭冠营销中心</a-descriptions-item>
@@ -31,7 +38,7 @@
       </a-collapse>
     </a-card>
     <!-- 选择产品 -->
-    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -51,7 +58,14 @@
                   </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-item label="产品品牌">
-                      <a-select placeholder="请选择" id="purchaseOrderEdit-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                      <a-select
+                        placeholder="请选择"
+                        id="purchaseOrderEdit-state"
+                        allowClear
+                        v-model="queryParam.dataSourceNo"
+                        :showSearch="true"
+                        option-filter-prop="children"
+                        :filter-option="filterOption">
                         <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                       </a-select>
                     </a-form-item>
@@ -87,6 +101,7 @@
               :rowKey="(record) => record.id"
               :columns="columns"
               :data="loadData"
+              :scroll="{ x: 1370 }"
               bordered>
               <!-- 采购数量 -->
               <template slot="storageQuantity" slot-scope="text, record">
@@ -100,7 +115,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleAdd(record)" id="purchaseOrderEdit-add-btn">添加</a-button>
+                <a-button size="small" type="link" @click="handleAdd(record)" id="purchaseOrderEdit-add-btn">添加</a-button>
               </template>
             </s-table>
           </div>
@@ -108,7 +123,7 @@
       </a-collapse>
     </a-card>
     <!-- 已选产品 -->
-    <a-card :bordered="false" class="purchaseOrderEdit-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1">
           <template slot="header">
@@ -129,6 +144,7 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
+              :scroll="{ x: 970 }"
               bordered>
               <!-- 采购数量 -->
               <template slot="storageQuantity" slot-scope="text, record">
@@ -142,7 +158,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="purchaseOrderEdit-del-btn">删除</a-button>
+                <a-button size="small" type="link" @click="handleDel(record)" id="purchaseOrderEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>
@@ -160,152 +176,154 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import basicInfoModal from './basicInfoModal.vue'
-  export default{
-    components: { STable, VSelect, basicInfoModal },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        advanced: false,  //  高级搜索 展开/关闭
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', sorter: true },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品级别', dataIndex: 'custsName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '终端会员价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '车主零售价', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '箱/单位', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '采购单价', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        // 表头
-        chooseColumns: [
-          { title: '产品编码', dataIndex: 'creatDaite', align: 'center', sorter: true },
-          { title: '产品名称', dataIndex: 'custNayme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购单价', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '单位', dataIndex: 'custsNakme', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购金额', dataIndex: 'custssNakme', align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥'+text : '--') } },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        chooseLoadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openModal: false, // 选择基本信息弹框是否显示
-      }
-    },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  添加
-      handleAdd(row){},
-      //  删除
-      handleDel(row){},
-      //  编辑基本信息
-      handleEditInfo(){
-        this.openModal = true
-      },
-      //  提交
-      handleSubmit(){
-        
-      },
-      //  基本信息  保存
-      handleOk(){
-        
-      },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
+import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
+export default {
+  components: { STable, VSelect, basicInfoModal },
+  data () {
+    return {
+      queryParam: {
+
       },
-      //  导入明细
-      handleImport(){
-        console.log(333)
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      advanced: false, //  高级搜索 展开/关闭
+      disabled: false, //  查询、重置按钮是否可操作
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品级别', dataIndex: 'custsName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '终端会员价', dataIndex: 'totalNums', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '车主零售价', scopedSlots: { customRender: 'purchaseNum' }, width: 110, align: 'center' },
+        { title: '箱/单位', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '采购单价', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, width: 150, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
-      filterOption(input, option) {
-      	return (
-      		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      	)
+      // 表头
+      chooseColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'creatDaite', width: 140, align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'custNayme', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, width: 150, align: 'center' },
+        { title: '单位', dataIndex: 'custsNakme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购金额', dataIndex: 'custssNakme', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? '¥' + text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      chooseLoadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', custssName: 0, creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       },
+      openModal: false // 选择基本信息弹框是否显示
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
+    },
+    //  添加
+    handleAdd (row) {},
+    //  删除
+    handleDel (row) {},
+    //  编辑基本信息
+    handleEditInfo () {
+      this.openModal = true
+    },
+    //  提交
+    handleSubmit () {
+
+    },
+    //  基本信息  保存
+    handleOk () {
+
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
+    },
+    //  导入明细
+    handleImport () {
+      console.log(333)
     },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-        vm.openModal = false
-      })
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+    })
   }
+}
 </script>
 
 <style lang="less">

+ 58 - 41
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" class="purchaseOrderList-wrap">
+  <a-card size="small" :bordered="false" class="purchaseOrderList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -16,9 +16,16 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-            	<a-select id="purchaseOrderList-customeName" placeholder="请选择供应商" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
-            		<a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
-            	</a-select>
+              <a-select
+                id="purchaseOrderList-customeName"
+                placeholder="请选择供应商"
+                allowClear
+                v-model="queryParam.dataSourceNo"
+                :showSearch="true"
+                option-filter-prop="children"
+                :filter-option="filterOption">
+                <a-select-option v-for="item in customeList" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -74,22 +81,31 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1595 }"
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{record.purchaseNo}}</span>
+        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseNo }}</span>
       </template>
-      <!-- 状态 -->
-      <template slot="state" slot-scope="text, record">
-        <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
+      <!-- 业务/审核状态 -->
+      <template slot="auditStatus" slot-scope="text, record">
+        <a-tag :color="record.state=='FINISH'?'green':'red'" >{{ record.state=='FINISH'? '待备货审核': '待单据审核' }}</a-tag>
+      </template>
+      <!-- 财务状态 -->
+      <template slot="financialStatus" slot-scope="text, record">
+        <a-tag :color="record.state==1?'green':'red'" >{{ record.state==1? '待提交': '待单据审核' }}</a-tag>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="purchasingManagement-edit-btn">编辑</a-button>
-        <a-button size="small" type="dashed" @click="handleDetail(record)" id="purchasingManagement-detail-btn" style="margin: 0 0 10px 8px">详情</a-button>
-        <a-button size="small" @click="handleSubmit(record)" id="purchasingManagement-submit-btn" style="margin: 0 0 10px 8px">提交</a-button>
-        <a-button size="small" type="primary" @click="handleWarehouse(record)" id="purchasingManagement-warehouse-btn" style="margin: 0 0 0 8px">签收入库</a-button>
-        <a-button size="small" type="danger" @click="handleDel(record)" id="purchasingManagement-del-btn" style="margin: 0 0 0 8px">删除</a-button>
+        <a-button size="small" type="link" @click="handleEdit(record)" id="purchasingManagement-edit-btn">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDetail(record)" id="purchasingManagement-detail-btn">详情</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleSubmit(record)" id="purchasingManagement-submit-btn">提交</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleWarehouse(record)" id="purchasingManagement-warehouse-btn">签收入库</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="purchasingManagement-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->
@@ -105,24 +121,25 @@ export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
     return {
-      advanced: false,  //  高级搜索 展开/关闭
+      advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 基本信息弹框是否显示
-      customeList:[],
+      customeList: [],
       // 查询参数
       queryParam: {},
       // 表头
       columns: [
-        { title: '采购单号', scopedSlots: { customRender: 'purchaseNo' }, align: 'center' },
-        { title: '创建时间', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '采购单号', scopedSlots: { customRender: 'purchaseNo' }, width: 140, align: 'center' },
+        { title: '创建时间', dataIndex: 'creatDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品款数', dataIndex: 'totalP', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购金额', dataIndex: 'totalPrice', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单据状态', dataIndex: 'payType', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结算状态', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '重要提示', dataIndex: 'shDate', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
+        { title: '产品款数', dataIndex: 'totalP', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购金额(¥)', dataIndex: 'totalPrice', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '业务状态', scopedSlots: { customRender: 'auditStatus' }, width: 100, align: 'center' },
+        { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 100, align: 'center' },
+        { title: '重要提示', dataIndex: 'shDate', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 290, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -137,12 +154,12 @@ export default {
         //   return data
         // })
         const _this = this
-        return new Promise(function(resolve, reject){
+        return new Promise(function (resolve, reject) {
           const data = {
             pageNo: 1,
             pageSize: 10,
             list: [
-              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+              { id: '1', purchaseNo: 'jgqp1111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
             ],
             count: 10
           }
@@ -153,43 +170,43 @@ export default {
           _this.disabled = false
           resolve(data)
         })
-      },
+      }
     }
   },
   methods: {
     //  新增
-    handleAdd(){
+    handleAdd () {
       this.openModal = true
     },
     //  基本信息  保存
-    handleOk(){
+    handleOk () {
       this.$router.push({ path: `/purchasingManagement/purchaseOrder/add` })
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ path: `/purchasingManagement/purchaseOrder/edit/${row.id}`})
+      this.$router.push({ path: `/purchasingManagement/purchaseOrder/edit/${row.id}` })
     },
     //  详情
-    handleDetail(row){
-      this.$router.push({ path: `/purchasingManagement/purchaseOrder/detail/${row.id}`})
+    handleDetail (row) {
+      this.$router.push({ path: `/purchasingManagement/purchaseOrder/detail/${row.id}` })
     },
     //  提交
-    handleSubmit(){
-      
+    handleSubmit () {
+
     },
     //  签收入库
-    handleWarehouse(row){
-      this.$router.push({ path: `/purchasingManagement/purchaseOrder/warehousing/${row.id}`})
+    handleWarehouse (row) {
+      this.$router.push({ path: `/purchasingManagement/purchaseOrder/warehousing/${row.id}` })
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           // delectRolePower({
           //   id: row.id
@@ -213,11 +230,11 @@ export default {
       this.newTime = undefined
       this.$refs.table.refresh(true)
     },
-    filterOption(input, option) {
+    filterOption (input, option) {
     	return (
     		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     	)
-    },
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
@@ -232,4 +249,4 @@ export default {
       margin-top: 15px;
     }
   }
-</style>
+</style>

+ 114 - 110
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -20,28 +20,31 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1050 }"
       bordered>
       <!-- 收货人 -->
       <template slot="consignee" slot-scope="text, record">
         <div class="item-box">
           <a-tooltip placement="top">
             <template slot="title">
-              <span>{{record.consignee}}</span>
+              <span>{{ record.consignee }}</span>
             </template>
-            <p class="ellipsis-txt">{{record.consignee}}</p>
+            <p class="ellipsis-txt">{{ record.consignee }}</p>
           </a-tooltip>
           <span v-if="record.isDefault" class="badge-txt">默认</span>
         </div>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button type="link" v-if="!record.isDefault" @click="handleDefault(record)" id="chooseAddressList-default-btn">设置为默认地址</a-button>
-        <a-button type="link" @click="handleEdit(record)" id="chooseAddressList-edit-btn" style="margin-left: 5px;">编辑</a-button>
-        <a-button type="link" @click="handleDel(record)" id="chooseAddressList-del-btn" style="margin-left: 5px;">删除</a-button>
+        <a-button size="small" type="link" v-if="!record.isDefault" @click="handleDefault(record)" id="chooseAddressList-default-btn">设置为默认地址</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleEdit(record)" id="chooseAddressList-edit-btn" style="margin-left: 5px;">编辑</a-button>
+        <a-divider type="vertical" style="margin: 0;" />
+        <a-button size="small" type="link" @click="handleDel(record)" id="chooseAddressList-del-btn" style="margin-left: 5px;">删除</a-button>
       </template>
       <!-- 选择 -->
       <template slot="choose" slot-scope="text, record">
-        <a-button type="primary" @click="handleChoose(record)" id="chooseAddressList-choose-btn">选择</a-button>
+        <a-button size="small" type="primary" @click="handleChoose(record)" id="chooseAddressList-choose-btn">选择</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑地址 -->
@@ -50,116 +53,117 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  import editAddressModal from './editAddressModal'
-  export default{
-    name: 'ChooseAddressModal',
-    components: { STable, VSelect, editAddressModal },
-    props: {
-      openModal: { //  弹框显示状态
-        type: Boolean,
-        default: false
-      }
-    },
-    data(){
-      return{
-        isShow: this.openModal, //  是否打开弹框
-        // 表头
-        columns: [
-          { title: '收货人', scopedSlots: { customRender: 'consignee' }, align: 'center', ellipsis: true },
-          { title: '手机号码', dataIndex: 'phone', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '收货地址', dataIndex: 'address', align: 'center', ellipsis: true },
-          { title: '操作', scopedSlots: { customRender: 'action' }, width: 295, align: 'center' },
-          { title: '选择', scopedSlots: { customRender: 'choose' }, width: 160, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', consignee: '张三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: true },
-                { id: '2', consignee: '张冀凯股份结构设计风格剑荡四方收费价格就会收到福建师范大书法家顾客三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: false },
-                { id: '3', consignee: '张三', phone: '15878458789', address: '陕西省西安市到福建师范大书法家雁塔区高新三路', isDefault: false },
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
-        openAddrModal: false, // 选择地址弹框是否显示
-      }
-    },
-    methods: {
-      //  设为默认
-      handleDefault(row){
-        
-      },
-      //  新增/编辑收货地址
-      handleEdit(row){
-        this.openAddrModal = true
-      },
-      //  选择
-      handleChoose(row){
-        
-      },
-      //  删除
-      handleDel(row){
+import { STable, VSelect } from '@/components'
+import editAddressModal from './editAddressModal'
+export default {
+  name: 'ChooseAddressModal',
+  components: { STable, VSelect, editAddressModal },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '收货人', scopedSlots: { customRender: 'consignee' }, align: 'center', ellipsis: true },
+        { title: '手机号码', dataIndex: 'phone', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收货地址', dataIndex: 'address', width: 300, align: 'center', ellipsis: true },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' },
+        { title: '选择', scopedSlots: { customRender: 'choose' }, width: 100, align: 'center', fixed: 'right' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
         const _this = this
-        this.$confirm({
-          title: '提示',
-          content: '删除后不可恢复,确定要进行删除吗?',
-          okText: '确定',
-          cancelText: '取消',
-		  centered: true,
-          onOk () {
-            // delectRolePower({
-            //   id: row.id
-            // }).then(res => {
-            //   console.log(res, 'res1111')
-            //   if (res.status == 200) {
-            //     _this.$message.success(res.message)
-            //     _this.$refs.table.refresh()
-            //   }
-            // })
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', consignee: '张三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: true },
+              { id: '2', consignee: '张冀凯股份结构设计风格剑荡四方收费价格就会收到福建师范大书法家顾客三', phone: '15878458789', address: '陕西省西安市雁塔区高新三路', isDefault: false },
+              { id: '3', consignee: '张三', phone: '15878458789', address: '陕西省西安市到福建师范大书法家雁塔区高新三路', isDefault: false }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
           }
+          _this.disabled = false
+          resolve(data)
         })
       },
-      //  地址保存
-      handleOk(data){
-        
-      }
+      openAddrModal: false // 选择地址弹框是否显示
+    }
+  },
+  methods: {
+    //  设为默认
+    handleDefault (row) {
+
     },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
-      },
-      //  重定义的弹框状态
-      isShow (newValue, oldValue) {
-        if (!newValue) {
-          this.$emit('close')
+    //  新增/编辑收货地址
+    handleEdit (row) {
+      this.openAddrModal = true
+    },
+    //  选择
+    handleChoose (row) {
+
+    },
+    //  删除
+    handleDel (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '删除后不可恢复,确定要进行删除吗?',
+        okText: '确定',
+        cancelText: '取消',
+		  centered: true,
+        onOk () {
+          // delectRolePower({
+          //   id: row.id
+          // }).then(res => {
+          //   console.log(res, 'res1111')
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
         }
+      })
+    },
+    //  地址保存
+    handleOk (data) {
+
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
       }
     }
   }
+}
 </script>
 
 <style lang="less">
@@ -171,9 +175,9 @@
       position: relative;
       .ellipsis-txt{
         margin: 0;
-        width: 100%;    
-        overflow: hidden;    
-        text-overflow:ellipsis;    
+        width: 100%;
+        overflow: hidden;
+        text-overflow:ellipsis;
         whitewhite-space: nowrap;
       }
       .badge-txt{

+ 94 - 97
src/views/purchasingManagement/purchaseOrder/receivingAddress/editAddressModal.vue

@@ -38,21 +38,21 @@
           <a-col span="8">
             <a-form-model-item prop="provinceCode">
               <a-select id="editAddress-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="请选择省">
-                <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in addrProvinceList" :value="item.sn" :key="item.sn + 'a'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="cityCode">
               <a-select id="editAddress-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="请选择市">
-                <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in addrCityList" :value="item.sn" :key="item.sn + 'b'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="districtCode">
               <a-select id="editAddress-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="请选择区/县">
-                <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in addrDistrictList" :value="item.sn" :key="item.sn + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
@@ -75,109 +75,106 @@
 </template>
 
 <script>
-  export default{
-    name: 'EditAddressModal',
-    props: {
-      openModal: { //  弹框显示状态
-        type: Boolean,
-        default: false
-      }
+import { getArea } from '@/api/data'
+export default {
+  name: 'EditAddressModal',
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 16 }
+      },
+      form: {
+        name: '',
+        phone: '',
+        districtCode: undefined
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入收货人', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '请输入手机号', trigger: 'blur' },
+          { pattern: /^\d{11}$/, message: '请输入正确的手机号' }
+        ]
+      },
+      addrProvinceList: [], //  省下拉
+      addrCityList: [], //  市下拉
+      addrDistrictList: [] //  区下拉
+    }
+  },
+  methods: {
+    //  保存
+    handleSubmit () {},
+    // 获取城市列表
+    getCityList (val) {
+      this.addrCityList = []
+      this.addrDistrictList = []
+      this.form.cityCode = undefined
+      this.form.districtCode = undefined
+      this.form.address = ''
+      this.getArea('city', val)
     },
-    data(){
-      return{
-        isShow: this.openModal, //  是否打开弹框
-        formItemLayout: {
-          labelCol: { span: 4 },
-          wrapperCol: { span: 16 }
-        },
-        form: {
-          name: '',
-          phone: '',
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入收货人', trigger: 'blur' }
-          ],
-          phone: [
-            { required: true, message: '请输入手机号', trigger: 'blur' },
-            { pattern: /^\d{11}$/, message: '请输入正确的手机号' }
-          ]
-        },
-        addrProvinceList: [], //  省下拉
-        addrCityList: [], //  市下拉
-        addrDistrictList: [] //  区下拉
-      }
+    // 获取区县列表
+    getAreaList (val) {
+      this.addrDistrictList = []
+      this.form.districtCode = undefined
+      this.form.address = ''
+      this.getArea('district', val)
     },
-    methods: {
-      //  保存
-      handleSubmit(){},
-      // 获取省列表'
-      getProvinceList () {
-        getProvince().then(res => {
-          if (res.status == 200) {
+    // 区县变更
+    areaCharged (val) {
+      this.form.address = ''
+    },
+    //  省/市/区
+    getArea (type, sn) {
+      let params
+      if (type == 'province') {
+        params = { level: '1' }
+      } else {
+        params = { psn: sn }
+      }
+      getArea(params).then(res => {
+        if (res.status == 200) {
+          if (type == 'province') {
             this.addrProvinceList = res.data || []
-          } else {
-            this.addrProvinceList = []
-          }
-        })
-      },
-      // 获取城市列表
-      getCityList (val) {
-        this.addrCityList = []
-        this.addrDistrictList = []
-        this.form.cityCode = undefined
-        this.form.districtCode = undefined
-        this.form.address = ''
-        this.getCityListRequest(val)
-      },
-      getCityListRequest (val) {
-        getCityByPro({
-          id: val
-        }).then(res => {
-          if (res.status == 200) {
+          } else if (type == 'city') {
             this.addrCityList = res.data || []
-          } else {
-            this.addrCityList = []
-          }
-        })
-      },
-      // 获取区县列表
-      getAreaList (val) {
-        this.addrDistrictList = []
-        this.form.districtCode = undefined
-        this.form.address = ''
-        this.getAreaListRequest(val)
-      },
-      getAreaListRequest (val) {
-        getDistrictByCity({
-          id: val
-        }).then(res => {
-          if (res.status == 200) {
+          } else if (type == 'district') {
             this.addrDistrictList = res.data || []
-          } else {
+          }
+        } else {
+          if (type == 'province') {
+            this.addrProvinceList = []
+          } else if (type == 'city') {
+            this.addrCityList = []
+          } else if (type == 'district') {
             this.addrDistrictList = []
           }
-        })
-      },
-      // 区县变更
-      areaCharged (val) {
-        this.form.address = ''
-      }
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
-      },
-      //  重定义的弹框状态
-      isShow (newValue, oldValue) {
-        if (!newValue) {
-          this.$emit('close')
         }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      } else {
+        this.getArea('province')
       }
     }
   }
+}
 </script>
-
-<style>
-</style>

+ 87 - 79
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -8,7 +8,7 @@
     </a-page-header>
     <!-- 内容 -->
     <a-page-header title="单号:CG2021010100001" ></a-page-header>
-    <a-card :bordered="false" class="purchaseOrderWarehousing-cont">
+    <a-card size="small" :bordered="false" class="purchaseOrderWarehousing-cont">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -20,7 +20,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
-                <a-select placeholder="请选择" id="purchaseOrderWarehousing-state" allowClear v-model="queryParam.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+                <a-select
+                  placeholder="请选择"
+                  id="purchaseOrderWarehousing-state"
+                  allowClear
+                  v-model="queryParam.dataSourceNo"
+                  :showSearch="true"
+                  option-filter-prop="children"
+                  :filter-option="filterOption">
                   <a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
                 </a-select>
               </a-form-item>
@@ -49,10 +56,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :scroll="{ x: 1360 }"
         bordered>
         <!-- 入库数量 -->
         <template slot="storageQuantity" slot-scope="text, record">
-          <span>{{record.storageQuantity}}</span>
+          <span>{{ record.storageQuantity }}</span>
           <a-input-number
             id="purchaseOrderWarehousing-storageQuantity"
             :value="record.storageQuantity"
@@ -76,89 +84,89 @@
 </template>
 
 <script>
-  import { STable, VSelect } from '@/components'
-  export default{
-    components: { STable, VSelect },
-    data(){
-      return{
-        queryParam: {
-          
-        },
-        brandData: [],  //  产品品牌  下拉数据
-        typeData: [],  //  产品类别  下拉数据
-        disabled: false, //  查询、重置按钮是否可操作
-        // 表头
-        columns: [
-          { title: '序号', dataIndex: 'no', align: 'center' },
-          { title: '产品编码', dataIndex: 'creatDate', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '原厂编码', dataIndex: 'totalP', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购单价', dataIndex: 'totalNums', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, align: 'center' },
-          { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, align: 'center' },
-          { title: '单位', dataIndex: 'mementPay', align: 'center', customRender: function (text) { return text || '--' } },
-          { title: '采购金额', dataIndex: 'shDate', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-          { title: '入库数量', scopedSlots: { customRender: 'storageQuantity' }, align: 'center' },
-          { title: '仓库仓位', scopedSlots: { customRender: 'warehousePosition' }, align: 'center' },
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          this.disabled = true
-          // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-          //   const data = res.data
-          //   const no = (data.pageNo - 1) * data.pageSize
-          //   for (var i = 0; i < data.list.length; i++) {
-          //     data.list[i].no = no + i + 1
-          //   }
-          //   this.disabled = false
-          //   return data
-          // })
-          const _this = this
-          return new Promise(function(resolve, reject){
-            const data = {
-              pageNo: 1,
-              pageSize: 10,
-              list: [
-                { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
-              ],
-              count: 10
-            }
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
-            _this.disabled = false
-            resolve(data)
-          })
-        },
+import { STable, VSelect } from '@/components'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      queryParam: {
+
+      },
+      brandData: [], //  产品品牌  下拉数据
+      typeData: [], //  产品类别  下拉数据
+      disabled: false, //  查询、重置按钮是否可操作
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '产品编码', dataIndex: 'creatDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'custName', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'totalP', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购单价', dataIndex: 'totalNums', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'purchaseNum' }, width: 100, align: 'center' },
+        { title: '缺货数量', scopedSlots: { customRender: 'outOfStockNum' }, width: 100, align: 'center' },
+        { title: '单位', dataIndex: 'mementPay', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '采购金额', dataIndex: 'shDate', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库数量', scopedSlots: { customRender: 'storageQuantity' }, width: 150, align: 'center' },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehousePosition' }, width: 150, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
+        //   const data = res.data
+        //   const no = (data.pageNo - 1) * data.pageSize
+        //   for (var i = 0; i < data.list.length; i++) {
+        //     data.list[i].no = no + i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function (resolve, reject) {
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', purchaseNo: 'jgqp11111111111', creatDate: '产品1', custName: 'jgqp111123545', totalP: '箭冠品牌', totalNums: '产品分类1', totalPrice: '5', payType: '122' }
+            ],
+            count: 10
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
       }
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.orderBundleNo = ''
+      this.queryParam.orderBundle.custMobile = ''
+      this.queryParam.bundleName = ''
+      this.queryParam.itemName = ''
+      this.oldTime = undefined
+      this.newTime = undefined
+      this.$refs.table.refresh(true)
     },
-    methods: {
-      //  重置
-      resetSearchForm () {
-        this.queryParam.orderBundleNo = ''
-        this.queryParam.orderBundle.custMobile = ''
-        this.queryParam.bundleName = ''
-        this.queryParam.itemName = ''
-        this.oldTime = undefined
-        this.newTime = undefined
-        this.$refs.table.refresh(true)
-      },
-      //  确认入库
-      handleWarehousing(){
-        
-      },
-      //  返回列表
-      handleBack(){
-        this.$router.push({ path: '/purchasingManagement/purchaseOrder/list'})
-      },
-      filterOption(input, option) {
+    //  确认入库
+    handleWarehousing () {
+
+    },
+    //  返回列表
+    handleBack () {
+      this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
+    },
+    filterOption (input, option) {
       	return (
       		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       	)
-      },
     }
   }
+}
 </script>
 
 <style lang="less">

+ 1 - 1
src/views/result/Error.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" style="margin: -24px -24px 0px;">
+  <a-card size="small" :bordered="false" style="margin: -24px -24px 0px;">
     <result type="error" :title="title" :description="description">
       <template slot="action">
         <a-button type="primary" >返回修改</a-button>

+ 1 - 1
src/views/result/Success.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" style="margin: -24px -24px 0px;">
+  <a-card size="small" :bordered="false" style="margin: -24px -24px 0px;">
     <result type="success" :description="description" :title="title">
       <template slot="action">
         <a-button type="primary">返回列表</a-button>

+ 2 - 2
src/views/salesManagement/backorder/detail.vue

@@ -6,7 +6,7 @@
         <a id="backorderDetail-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
       </template>
     </a-page-header>
-    <a-card :bordered="false" class="backorderDetail-cont">
+    <a-card size="small" :bordered="false" class="backorderDetail-cont">
       <a-descriptions :column="3">
         <a-descriptions-item label="客户名称">箭冠营销中心</a-descriptions-item>
         <a-descriptions-item label="客户地址">箭冠营销中心</a-descriptions-item>
@@ -21,7 +21,7 @@
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div slot="message">缺货总款数:<strong>1</strong>,缺货总数量:<strong>1</strong>,缺货总售价:<strong>0</strong></div>
     </a-alert>
-    <a-card :bordered="false" class="backorderDetail-cont">
+    <a-card size="small" :bordered="false" class="backorderDetail-cont">
       <!-- 列表 -->
       <s-table
         class="sTable"

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov