Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhaoxuebing 5 months ago
parent
commit
1597906bbb
  1. 2
      src/views/wms/countManage/count/countJobMain/index.vue
  2. 2
      src/views/wms/countManage/count/countPlanMain/index.vue
  3. 2
      src/views/wms/countManage/count/countRecordMain/index.vue
  4. 2
      src/views/wms/countManage/count/countRequestMain/index.vue
  5. 2
      src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
  6. 2
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  7. 2
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
  8. 2
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  9. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  10. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
  11. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  12. 2
      src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
  13. 2
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  14. 2
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  15. 2
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  16. 2
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  17. 2
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  18. 2
      src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
  19. 4
      src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts
  20. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  21. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
  22. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  23. 2
      src/views/wms/inventoryManage/balance/index.vue
  24. 2
      src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
  25. 2
      src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
  26. 2
      src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
  27. 2
      src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue
  28. 2
      src/views/wms/inventoryManage/expectin/index.vue
  29. 2
      src/views/wms/inventoryManage/expectout/index.vue
  30. 2
      src/views/wms/inventoryManage/locationcapacity/index.vue
  31. 2
      src/views/wms/inventoryManage/package/index.vue
  32. 2
      src/views/wms/inventoryManage/transaction/index.vue
  33. 2
      src/views/wms/inventoryManage/transferlog/index.vue
  34. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
  35. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  36. 2
      src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue
  37. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue
  38. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
  39. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  40. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue
  41. 2
      src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue
  42. 2
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
  43. 2
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
  44. 2
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  45. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
  46. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
  47. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
  48. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
  49. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
  50. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  51. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
  52. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
  53. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
  54. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
  55. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
  56. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  57. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
  58. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
  59. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  60. 2
      src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue
  61. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
  62. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  63. 2
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
  64. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
  65. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  66. 2
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
  67. 2
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
  68. 2
      src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
  69. 2
      src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
  70. 2
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
  71. 2
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  72. 2
      src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
  73. 2
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  74. 17
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  75. 17
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  76. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  77. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
  78. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
  79. 2
      src/views/wms/productionManage/productredress/productredressJobMain/index.vue
  80. 2
      src/views/wms/productionManage/productredress/productredressRecordMain/index.vue
  81. 2
      src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
  82. 2
      src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue
  83. 2
      src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
  84. 2
      src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue
  85. 2
      src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue
  86. 2
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

2
src/views/wms/countManage/count/countJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/countManage/count/countPlanMain/index.vue

@ -20,7 +20,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/countManage/count/countRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/countManage/count/countRequestMain/index.vue

@ -20,7 +20,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

4
src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@ -295,11 +295,11 @@ export const SaleMainRules = reactive({
],
contactPhone: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },
{ validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
// { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
contactEmail: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },
{ validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
// { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }

2
src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/balance/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/containerinit/containerRepair/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/expectin/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/expectout/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/locationcapacity/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/package/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/transaction/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryManage/transferlog/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

17
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductreceiptJobMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductreceiptJobMain.allSchemas.searchSchema,...ProductreceiptJobDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,11 +12,12 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptJobMain.allSchemas"
:detailAllSchemas="ProductreceiptJobDetail.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductreceiptJobMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductreceiptJobMain.allSchemas.tableColumns,...ProductreceiptJobDetail.allSchemas.tableMainColumns])
//
const updataTableColumns = (val) => {
@ -158,7 +159,11 @@ const isShowMainButton = (row,val) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return [
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), //

17
src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@ -1,7 +1,7 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProductreceiptRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search :schema="[...ProductreceiptRecordMain.allSchemas.searchSchema,...ProductreceiptRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
@ -12,11 +12,12 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRecordMain.allSchemas"
:detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
@ -32,8 +33,8 @@
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
@ -101,7 +102,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(ProductreceiptRecordMain.allSchemas.tableColumns)
const tableColumns = ref([...ProductreceiptRecordMain.allSchemas.tableColumns,...ProductreceiptRecordDetail.allSchemas.tableMainColumns])
// table
const buttondataTable = ref([{
label: 'Bom',
@ -169,7 +170,11 @@ const buttonBaseClick = (val, item) => {
}
// -
const butttondata = (row) => {
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>0&&findIndex<$index){
return []
}
return []
}

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptJobMain.allSchemas"
:detailAllSchemas=ProductreceiptJobDetail.allSchemas"
:detailAllSchemas="ProductreceiptJobDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRecordMain.allSchemas"
:detailAllSchemas=ProductreceiptRecordDetail.allSchemas"
:detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductreceiptRequestMain.allSchemas"
:detailAllSchemas=ProductreceiptRequestDetail.allSchemas"
:detailAllSchemas="ProductreceiptRequestDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressJobMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressJobMain.allSchemas"
:detailAllSchemas=ProductredressJobDetail.allSchemas"
:detailAllSchemas="ProductredressJobDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressRecordMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressRecordMain.allSchemas"
:detailAllSchemas=ProductredressRecordDetail.allSchemas"
:detailAllSchemas="ProductredressRecordDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@ -12,7 +12,7 @@
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProductredressRequestMain.allSchemas"
:detailAllSchemas=ProductredressRequestDetail.allSchemas"
:detailAllSchemas="ProductredressRequestDetail.allSchemas"
/>
<!-- 列表 -->

2
src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

2
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@ -16,7 +16,7 @@
<!-- 列表 -->
<ContentWrap>
<Table
<Table v-clientTable
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"

Loading…
Cancel
Save