Browse Source

整理PDA样式

hella_vue3
niexiting 5 months ago
parent
commit
06c418c66c
  1. 2
      src/components/show-modal/show-modal.vue
  2. 2
      src/mycomponents/balance/balanceDetailPopup.vue
  3. 2
      src/mycomponents/balance/balanceMove.vue
  4. 4
      src/mycomponents/common/comListHint.vue
  5. 2
      src/mycomponents/common/comMessage.vue
  6. 7
      src/mycomponents/detail/comDetailCard.vue
  7. 1
      src/mycomponents/detail/comRequestDetailCard.vue
  8. 8
      src/mycomponents/detail/detailCommonInfo.vue
  9. 4
      src/mycomponents/detail/recordDetailCommonInfo.vue
  10. 6
      src/mycomponents/detail/recordDetailPopup.vue
  11. 4
      src/mycomponents/detail/requestDetailCommonInfo.vue
  12. 4
      src/mycomponents/item/itemInfoPopup.vue
  13. 10
      src/mycomponents/item/itemQty.vue
  14. 12
      src/mycomponents/job/jobComMainCard.vue
  15. 6
      src/mycomponents/job/jobCommonInfo.vue
  16. 4
      src/mycomponents/job/jobInfoPopup.vue
  17. 2
      src/mycomponents/job/jobcomDetailCard.vue
  18. 2
      src/mycomponents/package/packageDetailPopup.vue
  19. 3
      src/mycomponents/qty/balanceQty.vue
  20. 12
      src/mycomponents/qty/balanceQtyEdit.vue
  21. 12
      src/mycomponents/qty/countQtyEdit.vue
  22. 8
      src/mycomponents/qty/inspectQtyEdit.vue
  23. 8
      src/mycomponents/qty/recommendQtyEdit.vue
  24. 8
      src/mycomponents/recommend/recommend.vue
  25. 2
      src/mycomponents/record/record.vue
  26. 4
      src/mycomponents/record/recordComDetailCard.vue
  27. 41
      src/mycomponents/record/recordComMainCard.vue
  28. 6
      src/mycomponents/record/recordCommonInfo.vue
  29. 2
      src/mycomponents/record/recordDetailCommonInfo.vue
  30. 4
      src/mycomponents/record/recordListDetailPoup.vue
  31. 2
      src/mycomponents/record/recordTop.vue
  32. 2
      src/mycomponents/request/requestComMainCard.vue
  33. 6
      src/mycomponents/request/requestCommonInfo.vue
  34. 2
      src/pages/container/coms/comContainerBindCard.vue
  35. 4
      src/pages/container/coms/comPalletRecord.vue
  36. 2
      src/pages/container/record/containerBindRecord.vue
  37. 2
      src/pages/container/record/containerUnBindRecord.vue
  38. 2
      src/pages/count/coms/comCountDetailCard.vue
  39. 2
      src/pages/count/coms/jobListPopup.vue
  40. 2
      src/pages/count/job/countDetail.vue
  41. 4
      src/pages/count/record/countRecord.vue
  42. 4
      src/pages/customerReturn/coms/comReturnRecord.vue
  43. 2
      src/pages/customerReturn/coms/jobInfoPopup.vue
  44. 2
      src/pages/customerReturn/coms/jobListPopup.vue
  45. 2
      src/pages/customerReturn/coms/requestInfoPopup.vue
  46. 2
      src/pages/customerReturn/job/returnDetail.vue
  47. 1
      src/pages/deliver/coms/comDeliverDetailCard.vue
  48. 8
      src/pages/deliver/coms/comDeliverRequestPopup.vue
  49. 2
      src/pages/deliver/coms/jobInfoPopup.vue
  50. 2
      src/pages/deliver/coms/jobListPopup.vue
  51. 2
      src/pages/deliver/coms/requestInfoPopup.vue
  52. 9
      src/pages/deliver/job/deliverDetail.vue
  53. 2
      src/pages/deliver/record/deliverRecord.vue
  54. 2
      src/pages/deliver/request/deliverRequestDetail.vue
  55. 4
      src/pages/inspect/coms/comInspectDetailCard.vue
  56. 2
      src/pages/inspect/coms/comInspectJobList.vue
  57. 8
      src/pages/inspect/coms/inspectComDetailCard.vue
  58. 2
      src/pages/inspect/coms/inspectInfoPopup.vue
  59. 2
      src/pages/inspect/coms/requestInfoPopup.vue
  60. 2
      src/pages/inspect/job/inspectResult.vue
  61. 2
      src/pages/inspect/request/inspectRequestDetail.vue
  62. 4
      src/pages/inventoryMove/coms/comInventoryDetailCard.vue
  63. 4
      src/pages/inventoryMove/coms/comMove.vue
  64. 2
      src/pages/inventoryMove/coms/comMoveRecord.vue
  65. 2
      src/pages/inventoryMove/coms/comMoveRecordCard.vue
  66. 2
      src/pages/inventoryMove/coms/jobListPopup.vue
  67. 2
      src/pages/inventoryMove/job/inventoryMoveDetail.vue
  68. 4
      src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue
  69. 2
      src/pages/issue-按批次推荐/coms/comIssueRecommend.vue
  70. 20
      src/pages/issue/coms/comIssueDetailCard.vue
  71. 7
      src/pages/issue/coms/comIssueJobCard.vue
  72. 2
      src/pages/issue/coms/comIssueRecommend.vue
  73. 2
      src/pages/issue/coms/comIssueRequestCreator.vue
  74. 2
      src/pages/issue/coms/comIssueRequestDetailCard.vue
  75. 10
      src/pages/issue/coms/comIssueRequestPopup.vue
  76. 2
      src/pages/issue/coms/jobListPopup.vue
  77. 2
      src/pages/issue/coms/requestInfoPopup.vue
  78. 5
      src/pages/issue/job/issueDetail.vue
  79. 2
      src/pages/package/coms/comOverPackJobDetailCard.vue
  80. 6
      src/pages/package/job/overPackageJobDetail.vue
  81. 2
      src/pages/package/record/mergePackageRecord.vue
  82. 2
      src/pages/package/record/overPackageRecord.vue
  83. 2
      src/pages/productDismantle/coms/comProductDetailCard.vue
  84. 4
      src/pages/productDismantle/coms/comProductRecord.vue
  85. 2
      src/pages/productDismantle/coms/jobListPopup.vue
  86. 2
      src/pages/productDismantle/coms/requestInfoPopup.vue
  87. 4
      src/pages/productDismantle/job/productDismantleDetail.vue
  88. 2
      src/pages/productDismantle/record/productDismantleRecord.vue
  89. 2
      src/pages/productPutaway/coms/comProductDetailCard.vue
  90. 2
      src/pages/productPutaway/coms/jobListPopup.vue
  91. 2
      src/pages/productPutaway/coms/requestInfoPopup.vue
  92. 3
      src/pages/productPutaway/job/productPutawayDetail.vue
  93. 2
      src/pages/productPutaway/record/productPutawayRecord.vue
  94. 2
      src/pages/productPutaway/request/putawayRequestDetail.vue
  95. 6
      src/pages/productReceipt/coms/comProductDetailCard.vue
  96. 100
      src/pages/productReceipt/coms/comProductJobCard.vue
  97. 2
      src/pages/productReceipt/coms/comProductRecord.vue
  98. 2
      src/pages/productReceipt/coms/jobInfoPopup.vue
  99. 2
      src/pages/productReceipt/coms/jobListPopup.vue
  100. 2
      src/pages/productReceipt/coms/productDetailInfoPopup.vue

2
src/components/show-modal/show-modal.vue

@ -13,7 +13,7 @@
</scroll-view> </scroll-view>
<u-line></u-line> <view class='split_line'></view>
<slot name="button"> <slot name="button">
<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;"> <view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;">
<view v-if="showCancelButton" class="cance_button" @tap="$u.throttle(cancelClose, 500)"> <view v-if="showCancelButton" class="cance_button" @tap="$u.throttle(cancelClose, 500)">

2
src/mycomponents/balance/balanceDetailPopup.vue

@ -4,7 +4,7 @@
<!-- <com-item :dataContent="dataContent.package"></com-item> <!-- <com-item :dataContent="dataContent.package"></com-item>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<view v-for="(item, index) in dataList" style="width: 100%;"> <view v-for="(item, index) in dataList" style="width: 100%;">
<view class="item"> <view class="item">

2
src/mycomponents/balance/balanceMove.vue

@ -18,7 +18,7 @@
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</template> </template>

4
src/mycomponents/common/comListHint.vue

@ -39,14 +39,14 @@
</view> --> </view> -->
</view> </view>
<u-line></u-line> <view class='split_line'></view>
<view class="" v-for="(item, index) in dataList"> <view class="" v-for="(item, index) in dataList">
<view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')"> <view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')">
<text class="item_title">{{item.title}} : </text> <text class="item_title">{{item.title}} : </text>
<text class="text_wrap">{{item.content}} </text> <text class="text_wrap">{{item.content}} </text>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
<view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;" <view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;"
class="uni-flex uni-row space-between u-col-center"> class="uni-flex uni-row space-between u-col-center">
<view class="uni-flex uni-row u-col-center " style="flex: 1; overflow: hidden;"> <view class="uni-flex uni-row u-col-center " style="flex: 1; overflow: hidden;">

2
src/mycomponents/common/comMessage.vue

@ -11,7 +11,7 @@
</rich-text> </rich-text>
</slot> </slot>
<u-line></u-line> <view class='split_line'></view>
<slot name="button"> <slot name="button">
<view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;"> <view class="uni-flex uni-row u-col-center space-between" style="width: 100%;height: 48px;">
<view v-if="showCancelButton" class="cance_button" @tap="cancelClose"> <view v-if="showCancelButton" class="cance_button" @tap="cancelClose">

7
src/mycomponents/detail/comDetailCard.vue

@ -3,10 +3,11 @@
<uni-collapse ref="collapse1" @change=""> <uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true"> <uni-collapse-item :open="true">
<template v-slot:title> <template v-slot:title>
<item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowStdPack="false"> <item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"
:isShowStdPack="false">
</item-compare-qty> </item-compare-qty>
</template> </template>
<u-line></u-line>
<view class="" v-for="(item,index) in dataContent.subList" :key="index"> <view class="" v-for="(item,index) in dataContent.subList" :key="index">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"
@ -159,4 +160,4 @@
</script> </script>
<style> <style>
</style> </style>

1
src/mycomponents/detail/comRequestDetailCard.vue

@ -11,7 +11,6 @@
:isShowStdPack="false"> :isShowStdPack="false">
</item-compare-qty> </item-compare-qty>
</template> </template>
<u-line />
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"

8
src/mycomponents/detail/detailCommonInfo.vue

@ -1,16 +1,16 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<detail-item-info :dataContent="dataContent"></detail-item-info> <detail-item-info :dataContent="dataContent"></detail-item-info>
<u-line></u-line> <view class='split_line'></view>
<detail-recommend-info :dataContent="dataContent"></detail-recommend-info> <detail-recommend-info :dataContent="dataContent"></detail-recommend-info>
<u-line></u-line> <view class='split_line'></view>
<view v-if="dataContent.record!=undefined"> <view v-if="dataContent.record!=undefined">
<detail-handle-info :dataContent="dataContent"> <detail-handle-info :dataContent="dataContent">
</detail-handle-info> </detail-handle-info>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
<slot> <slot>
<!-- 每个任务的详情 --> <!-- 每个任务的详情 -->

4
src/mycomponents/detail/recordDetailCommonInfo.vue

@ -1,12 +1,12 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<!-- 物品 --> <!-- 物品 -->
<detail-item-info :dataContent="dataContent"></detail-item-info> <detail-item-info :dataContent="dataContent"></detail-item-info>
<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> --> <!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
<u-line></u-line> <view class='split_line'></view>
<!-- 库存余额 --> <!-- 库存余额 -->
<detail-balance-info :dataContent="dataContent"></detail-balance-info> <detail-balance-info :dataContent="dataContent"></detail-balance-info>
<!-- 包装 --> <!-- 包装 -->

6
src/mycomponents/detail/recordDetailPopup.vue

@ -2,14 +2,14 @@
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<!-- 物品 --> <!-- 物品 -->
<detail-item-info :dataContent="dataContent"></detail-item-info> <detail-item-info :dataContent="dataContent"></detail-item-info>
<u-line></u-line> <view class='split_line'></view>
<!-- 库存余额 --> <!-- 库存余额 -->
<detail-balance-info :dataContent="dataContent"></detail-balance-info> <detail-balance-info :dataContent="dataContent"></detail-balance-info>
<u-line></u-line> <view class='split_line'></view>
<!-- 包装 --> <!-- 包装 -->
<detail-package-info :dataContent="dataContent.package"></detail-package-info> <detail-package-info :dataContent="dataContent.package"></detail-package-info>
</scroll-view> </scroll-view>

4
src/mycomponents/detail/requestDetailCommonInfo.vue

@ -1,12 +1,12 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<!-- 物品 --> <!-- 物品 -->
<detail-item-info :dataContent="dataContent"></detail-item-info> <detail-item-info :dataContent="dataContent"></detail-item-info>
<!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> --> <!-- <request-detail-basic-info :dataContent="dataContent"></request-detail-basic-info> -->
<u-line></u-line> <view class='split_line'></view>
<!-- 包装 --> <!-- 包装 -->
<!-- 库存余额 --> <!-- 库存余额 -->

4
src/mycomponents/item/itemInfoPopup.vue

@ -39,14 +39,14 @@
</view> --> </view> -->
</view> </view>
<u-line></u-line> <view class='split_line'></view>
<view class="" v-for="(item, index) in dataList"> <view class="" v-for="(item, index) in dataList">
<view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')"> <view class="item" v-if="(item.title!='worker')" v-show="(item.title!='date')">
<text class="item_title">{{item.title}} : </text> <text class="item_title">{{item.title}} : </text>
<text class="text_wrap">{{item.content}} </text> <text class="text_wrap">{{item.content}} </text>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
<view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;" <view v-if="isShowbottom" style="margin-top: 10rpx;margin-bottom: 10rpx;width: 100%;display: flex;"
class="uni-flex uni-row space-between u-col-center"> class="uni-flex uni-row space-between u-col-center">
<view class="uni-flex uni-row u-col-center " style="flex: 1; overflow: hidden;"> <view class="uni-flex uni-row u-col-center " style="flex: 1; overflow: hidden;">

10
src/mycomponents/item/itemQty.vue

@ -4,19 +4,11 @@
<item :dataContent="dataContent"></item> <item :dataContent="dataContent"></item>
</view> </view>
<view> <view>
<balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
<!-- showBalanceQty -->
<balanceQty v-if="isShowBalanceQty" :dataContent="dataContent"></balanceQty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack"> :handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack">
</compare-qty> </compare-qty>
</view> </view>
<!-- <view v-else>
<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false"></recommend-qty>
<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
:handleQty="Number(handleQty)" :isShowStatus="false">
</compare-qty>
</view> -->
</view> </view>
</template> </template>
<script> <script>

12
src/mycomponents/job/jobComMainCard.vue

@ -2,8 +2,9 @@
<view> <view>
<view class="task_card"> <view class="task_card">
<job-top :dataContent="dataContent"></job-top> <job-top :dataContent="dataContent"></job-top>
<!-- <view class="split_line"></view> -->
<slot></slot> <slot></slot>
<u-line color="#909399" /> <view class="split_line"></view>
<job-bottom :dataContent="dataContent"></job-bottom> <job-bottom :dataContent="dataContent"></job-bottom>
</view> </view>
</view> </view>
@ -19,10 +20,9 @@
jobBottom, jobBottom,
}, },
data() { data() {
return { return {};
};
}, },
props: { props: {
dataContent: { dataContent: {
type: Object, type: Object,
@ -31,11 +31,11 @@
}, },
methods: { methods: {
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
</style> </style>

6
src/mycomponents/job/jobCommonInfo.vue

@ -1,15 +1,15 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<job-top :dataContent="dataContent"></job-top> <job-top :dataContent="dataContent"></job-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<slot> <slot>
<!-- 每个任务的详情 --> <!-- 每个任务的详情 -->
</slot> </slot>
<job-request-info :dataContent="dataContent"></job-request-info> <job-request-info :dataContent="dataContent"></job-request-info>
<u-line></u-line> <view class='split_line'></view>
<job-person-info :dataContent="dataContent"></job-person-info> <job-person-info :dataContent="dataContent"></job-person-info>
<u-line></u-line> <view class='split_line'></view>
<job-setting-info :dataContent="dataContent"></job-setting-info> <job-setting-info :dataContent="dataContent"></job-setting-info>
</scroll-view> </scroll-view>

4
src/mycomponents/job/jobInfoPopup.vue

@ -3,13 +3,13 @@
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="pop_detail" style="height:500px"> <view class="pop_detail" style="height:500px">
<job-top :dataContent="dataContent"></job-top> <job-top :dataContent="dataContent"></job-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<slot> <slot>
<!-- 每个任务的详情 --> <!-- 每个任务的详情 -->
</slot> </slot>
<job-person-info :dataContent="dataContent"></job-person-info> <job-person-info :dataContent="dataContent"></job-person-info>
<u-line></u-line> <view class='split_line'></view>
<job-setting-info :dataContent="dataContent"></job-setting-info> <job-setting-info :dataContent="dataContent"></job-setting-info>
</scroll-view> </scroll-view>

2
src/mycomponents/job/jobcomDetailCard.vue

@ -6,7 +6,7 @@
<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)"> <item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)">
</item-compare-qty> </item-compare-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"

2
src/mycomponents/package/packageDetailPopup.vue

@ -2,7 +2,7 @@
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<com-item :dataContent="dataContent"></com-item> <com-item :dataContent="dataContent"></com-item>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:320px "> <scroll-view style="height:320px ">
<view v-for="(item, index) in dataList" style="width: 100%;"> <view v-for="(item, index) in dataList" style="width: 100%;">
<view class="item"> <view class="item">

3
src/mycomponents/qty/balanceQty.vue

@ -6,7 +6,8 @@
{{Number(dataContent.qty)}} {{Number(dataContent.qty)}}
</text> </text>
</view> </view>
<uom v-if="dataContent.packQty==undefined" :uom="dataContent.uom"></uom> <!-- v-if="dataContent.packQty==undefined" -->
<uom :uom="dataContent.uom"></uom>
</view> </view>
<view class="uni-flex uni-row center"> <view class="uni-flex uni-row center">
<pack-unit :dataContent="dataContent"></pack-unit> <pack-unit :dataContent="dataContent"></pack-unit>

12
src/mycomponents/qty/balanceQtyEdit.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeEditPopup"></image> @click="closeEditPopup"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; height:60%;"> <view class="uni-flex uni-column" style="background-color: white; height:60%;">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
<view class="uni-flex uni-row space-between padding title "> <view class="uni-flex uni-row space-between padding title ">
@ -22,7 +22,7 @@
<!-- <uom :uom="dataContent.packUnit"></uom> --> <!-- <uom :uom="dataContent.packUnit"></uom> -->
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>标包量 : </text> <text>标包量 : </text>
<view class="uni-flex u-col-center uni-row"> <view class="uni-flex u-col-center uni-row">
@ -31,7 +31,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>数量 : </text> <text>数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;"> <view class="uni-flex uni-row uni-center" style="align-items: center;">
@ -40,7 +40,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>库存数量 : </text> <text>库存数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;"> <view class="uni-flex uni-row uni-center" style="align-items: center;">
@ -48,7 +48,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view v-if="isShowStatus" class="uni-flex uni-row space-between title u-col-center" <view v-if="isShowStatus" class="uni-flex uni-row space-between title u-col-center"
style="padding-left: 30rpx;"> style="padding-left: 30rpx;">
<text>库存状态 : </text> <text>库存状态 : </text>
@ -58,7 +58,7 @@
</balanceStatus> </balanceStatus>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</view> </view>

12
src/mycomponents/qty/countQtyEdit.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeEditPopup"></image> @click="closeEditPopup"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; height:60%;"> <view class="uni-flex uni-column" style="background-color: white; height:60%;">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
<view class="uni-flex uni-row space-between padding title "> <view class="uni-flex uni-row space-between padding title ">
@ -24,7 +24,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>标包量 : </text> <text>标包量 : </text>
<view class="uni-flex u-col-center uni-row"> <view class="uni-flex u-col-center uni-row">
@ -33,7 +33,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>数量 : </text> <text>数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;"> <view class="uni-flex uni-row uni-center" style="align-items: center;">
@ -42,7 +42,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view v-if="isShowBalance" <view v-if="isShowBalance"
class="uni-flex uni-row space-between padding title u-col-center"> class="uni-flex uni-row space-between padding title u-col-center">
<text>库存数量 : </text> <text>库存数量 : </text>
@ -51,7 +51,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view v-if="isShowStatus" class="uni-flex uni-row space-between title" <view v-if="isShowStatus" class="uni-flex uni-row space-between title"
style="align-items: center; padding-left: 30rpx;"> style="align-items: center; padding-left: 30rpx;">
<text>库存状态 : </text> <text>库存状态 : </text>
@ -61,7 +61,7 @@
</balanceStatus> </balanceStatus>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</view> </view>

8
src/mycomponents/qty/inspectQtyEdit.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeEditPopup"></image> @click="closeEditPopup"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; height:60%;"> <view class="uni-flex uni-column" style="background-color: white; height:60%;">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
@ -22,7 +22,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>不合格数量 : </text> <text>不合格数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;"> <view class="uni-flex uni-row uni-center" style="align-items: center;">
@ -31,7 +31,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row u-col-center" style="width: 100%;"> <view class="uni-flex uni-row u-col-center" style="width: 100%;">
<view class="" <view class=""
style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;"> style=" text-align: center;font-size: 32rpx;font-weight: 700;margin-left: 20rpx;">
@ -41,7 +41,7 @@
placeholder="请选择原因" popup-title="选择不合格原因" :localdata="reasonList" v-model="reason"> placeholder="请选择原因" popup-title="选择不合格原因" :localdata="reasonList" v-model="reason">
</uni-data-picker> </uni-data-picker>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>

8
src/mycomponents/qty/recommendQtyEdit.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeEditPopup"></image> @click="closeEditPopup"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; height:60%;"> <view class="uni-flex uni-column" style="background-color: white; height:60%;">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
<view class="uni-flex uni-row space-between padding title "> <view class="uni-flex uni-row space-between padding title ">
@ -22,7 +22,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>包装规格 : </text> <text>包装规格 : </text>
<view class="uni-flex u-col-center uni-row"> <view class="uni-flex u-col-center uni-row">
@ -31,7 +31,7 @@
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row space-between padding title u-col-center"> <view class="uni-flex uni-row space-between padding title u-col-center">
<text>总数量 : </text> <text>总数量 : </text>
<view class="uni-flex uni-row uni-center" style="align-items: center;"> <view class="uni-flex uni-row uni-center" style="align-items: center;">
@ -40,7 +40,7 @@
<uom :uom="dataContent.uom"></uom> <uom :uom="dataContent.uom"></uom>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</view> </view>

8
src/mycomponents/recommend/recommend.vue

@ -13,18 +13,18 @@
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode"> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
</to-location> </to-location>
</view> </view>
<view style="word-break: break-all;"> <view style="word-break: break-all;" class="uni-flex uni-row center">
<!-- ||detail.handleQty==0 可能会有扫描到0的情况--> <!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
{{detail.handleQty}}
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail" <recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty> :isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)" <compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false"> :handleQty="Number(detail.handleQty)" :isShowStdPack="false">
</compare-qty> </compare-qty>
<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()"> <view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text> <text style="font-size: 30rpx;color: #2979ff; width: 20px; " @click="copy">复制</text>
<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text> <!-- <text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text> -->
</view> </view>
</view> </view>
</view> </view>

2
src/mycomponents/record/record.vue

@ -16,7 +16,7 @@
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</template> </template>

4
src/mycomponents/record/recordComDetailCard.vue

@ -10,7 +10,7 @@
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<!-- <u-line /> --> <!-- <view class='split_line'></view> -->
<view class="" v-for="(detail,index) in dataContent.subList"> <view class="" v-for="(detail,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,detail,index)" <uni-swipe-action-item @click="swipeClick($event,detail,index)"
@ -20,7 +20,7 @@
</balance> </balance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<!-- <u-line /> --> <!-- <view class='split_line'></view> -->
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

41
src/mycomponents/record/recordComMainCard.vue

@ -0,0 +1,41 @@
<template>
<view>
<view class="task_card">
<record-top :dataContent="dataContent"></record-top>
<slot></slot>
<u-line color="#909399" />
<record-bottom :dataContent="dataContent"></record-bottom>
</view>
</view>
</template>
<script>
import recordTop from '@/mycomponents/record/recordTop.vue'
import recordBottom from '@/mycomponents/record/recordBottom.vue'
export default {
components: {
recordTop,
recordBottom,
},
data() {
return {
};
},
props: {
dataContent: {
type: Object,
default: {}
},
},
methods: {
}
}
</script>
<style lang="scss">
</style>

6
src/mycomponents/record/recordCommonInfo.vue

@ -1,14 +1,14 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<record-top :dataContent="dataContent"></record-top> <record-top :dataContent="dataContent"></record-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo> <recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
<!-- 主表 --> <!-- 主表 -->
<!-- <recordMainInfo :dataContent="dataContent"></recordMainInfo> <!-- <recordMainInfo :dataContent="dataContent"></recordMainInfo>
<u-line></u-line> <view class='split_line'></view>
<recordItemInfo :dataContent="detailContent"></recordItemInfo> <recordItemInfo :dataContent="detailContent"></recordItemInfo>
<u-line></u-line> <view class='split_line'></view>
<recordPersonInfo :dataContent="detailContent"></recordPersonInfo> --> <recordPersonInfo :dataContent="detailContent"></recordPersonInfo> -->
<u-line></u-line> <u-line></u-line>
<slot> <slot>

2
src/mycomponents/record/recordDetailCommonInfo.vue

@ -1,7 +1,7 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<record-top :dataContent="dataContent"></record-top> <record-top :dataContent="dataContent"></record-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo> <recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
<u-line></u-line> <u-line></u-line>

4
src/mycomponents/record/recordListDetailPoup.vue

@ -3,10 +3,10 @@
<uni-popup ref="popup"> <uni-popup ref="popup">
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<record-top :dataContent="dataContent"></record-top> <record-top :dataContent="dataContent"></record-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo> <recordListCommonInfo :dataContent="dataContent"></recordListCommonInfo>
<u-line></u-line> <view class='split_line'></view>
<slot> <slot>
<!-- 每个任务的详情 --> <!-- 每个任务的详情 -->
</slot> </slot>

2
src/mycomponents/record/recordTop.vue

@ -2,7 +2,7 @@
<view class="task_item"> <view class="task_item">
<view class="uni-flex space-between u-col-center"> <view class="uni-flex space-between u-col-center">
<record-number :number="dataContent.number"></record-number> <record-number :number="dataContent.number"></record-number>
<record-status :jobStatus="dataContent.status"></record-status> <!-- <record-status :jobStatus="dataContent.status"></record-status> -->
</view> </view>
</view> </view>
</template> </template>

2
src/mycomponents/request/requestComMainCard.vue

@ -3,7 +3,7 @@
<view class="task_card"> <view class="task_card">
<request-top :dataContent="dataContent"></request-top> <request-top :dataContent="dataContent"></request-top>
<slot></slot> <slot></slot>
<u-line color="#909399" /> <view class="split_line"></view>
<request-bottom :dataContent="dataContent"></request-bottom> <request-bottom :dataContent="dataContent"></request-bottom>
</view> </view>
</view> </view>

6
src/mycomponents/request/requestCommonInfo.vue

@ -1,14 +1,14 @@
<template> <template>
<view class="pop_detail" style="height:80%"> <view class="pop_detail" style="height:80%">
<request-top :dataContent="dataContent"></request-top> <request-top :dataContent="dataContent"></request-top>
<u-line></u-line> <view class='split_line'></view>
<scroll-view style="height:400px "> <scroll-view style="height:400px ">
<requestListCommonInfo :dataContent="dataContent"></requestListCommonInfo> <requestListCommonInfo :dataContent="dataContent"></requestListCommonInfo>
<!-- 主表 --> <!-- 主表 -->
<!-- <requestMainInfo :dataContent="dataContent"></requestMainInfo> <!-- <requestMainInfo :dataContent="dataContent"></requestMainInfo>
<u-line></u-line> <view class='split_line'></view>
<requestItemInfo :dataContent="detailContent"></requestItemInfo> <requestItemInfo :dataContent="detailContent"></requestItemInfo>
<u-line></u-line> <view class='split_line'></view>
<requestPersonInfo :dataContent="detailContent"></requestPersonInfo> --> <requestPersonInfo :dataContent="detailContent"></requestPersonInfo> -->
<u-line></u-line> <u-line></u-line>
<slot> <slot>

2
src/pages/container/coms/comContainerBindCard.vue

@ -11,7 +11,7 @@
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<balance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :isShowStatus="false" <balance :dataContent="item" :isShowStdPack="false" :isShowPack="true" :isShowStatus="false"
:isShowBatch="true" :toInventoryStatus="item.toInventoryStatus" :isShowBatch="true" :toInventoryStatus="item.toInventoryStatus"

4
src/pages/container/coms/comPalletRecord.vue

@ -11,7 +11,7 @@
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"
@ -21,7 +21,7 @@
</balance> </balance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<!-- <u-line color="#D8D8D8"></u-line> --> <!-- <view class='split_line'></view> -->
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

2
src/pages/container/record/containerBindRecord.vue

@ -9,7 +9,7 @@
<targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false" <targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false"
@getContainer="getContainer"></targetContainer> @getContainer="getContainer"></targetContainer>
</view> </view>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

2
src/pages/container/record/containerUnBindRecord.vue

@ -9,7 +9,7 @@
<targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false" <targetContainer ref="targetContainer" title="托盘" :containerCode="containerCode" :isShowEdit="false"
@getContainer="getContainer"></targetContainer> @getContainer="getContainer"></targetContainer>
</view> </view>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

2
src/pages/count/coms/comCountDetailCard.vue

@ -21,7 +21,7 @@
<recommend-count :detail="item" :isShowFromLocation="false" style='margin:1px 0px;' <recommend-count :detail="item" :isShowFromLocation="false" style='margin:1px 0px;'
:isShowRecommendQty="settingParam.isOpenCount=='TRUE'"> :isShowRecommendQty="settingParam.isOpenCount=='TRUE'">
</recommend-count> </recommend-count>
<u-line /> <view class='split_line'></view>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>

2
src/pages/count/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-count-job-card :dataContent="item" @click='selectItem(item)'></com-count-job-card> <com-count-job-card :dataContent="item" @click='selectItem(item)'></com-count-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/count/job/countDetail.vue

@ -31,7 +31,7 @@
@updateData="updateData"> @updateData="updateData">
</com-count-detail-card> </com-count-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

4
src/pages/count/record/countRecord.vue

@ -7,7 +7,7 @@
<requiredLocation title="盘点库位" :locationCode="fromLocationCode" <requiredLocation title="盘点库位" :locationCode="fromLocationCode"
:isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode' :isShowEdit="jobContent.allowModifyLocation==1" @getLocation='scanLocationCode'
:locationAreaTypeList="locationAreaTypeList"></requiredLocation> :locationAreaTypeList="locationAreaTypeList"></requiredLocation>
<u-line></u-line> <view class='split_line'></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -17,7 +17,7 @@
@editItem="editItem"> @editItem="editItem">
</com-count-detail-card> </com-count-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

4
src/pages/customerReturn/coms/comReturnRecord.vue

@ -11,7 +11,7 @@
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"
@ -20,7 +20,7 @@
</production-label> </production-label>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

2
src/pages/customerReturn/coms/jobInfoPopup.vue

@ -34,7 +34,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</job-common-info> </job-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/customerReturn/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card> <com-return-job-card :dataContent="item" @click='selectItem(item)'></com-return-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/customerReturn/coms/requestInfoPopup.vue

@ -5,7 +5,7 @@
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <comListItem :dataList="dataList"></comListItem>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/customerReturn/job/returnDetail.vue

@ -9,7 +9,7 @@
:locationAreaTypeList="toLocationAreaTypeList"> :locationAreaTypeList="toLocationAreaTypeList">
</com-detail-card> </com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

1
src/pages/deliver/coms/comDeliverDetailCard.vue

@ -10,7 +10,6 @@
<!-- 物品 --> <!-- 物品 -->
<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty> <item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
</template> </template>
<u-line />
<view v-for="(loacation,index) in item.Locations"> <view v-for="(loacation,index) in item.Locations">
<view> <view>
<view class="uni-flex uni-row space-between"> <view class="uni-flex uni-row space-between">

8
src/pages/deliver/coms/comDeliverRequestPopup.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeRequestPopup()"></image> @click="closeRequestPopup()"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; "> <view class="uni-flex uni-column" style="background-color: white; ">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
@ -23,7 +23,7 @@
@confirm="confirmSelect"></u-select> @confirm="confirmSelect"></u-select>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
<text>物料 : </text> <text>物料 : </text>
@ -36,7 +36,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
<text>数量 : </text> <text>数量 : </text>
@ -52,7 +52,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</view> </view>

2
src/pages/deliver/coms/jobInfoPopup.vue

@ -34,7 +34,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</job-common-info> </job-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/deliver/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-deliver-job-card :dataContent="item" @click='selectItem(item)'></com-deliver-job-card> <com-deliver-job-card :dataContent="item" @click='selectItem(item)'></com-deliver-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/deliver/coms/requestInfoPopup.vue

@ -6,7 +6,7 @@
<comListItem :dataList="dataList"></comListItem> <comListItem :dataList="dataList"></comListItem>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

9
src/pages/deliver/job/deliverDetail.vue

@ -4,18 +4,17 @@
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<view class="header_item"> <!-- <view class="header_item">
申请单号{{jobContent.requestNumber}} 申请单号{{jobContent.requestNumber}}
</view> </view>
-->
<u-line color="#D8D8D8"></u-line>
<view class="cen_card" style="padding: 5rpx;"> <view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row"> <view class="cell_box uni-flex uni-row">
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">发货类型</view> <view class="text_lightblue">发货类型</view>
<view>{{jobContent.deliverType}}</view> <view>{{jobContent.deliverType}}</view>
</view> </view>
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">客户代码</view> <view class="text_lightblue">客户代码</view>
<view>{{jobContent.customerCode}}</view> <view>{{jobContent.customerCode}}</view>
@ -26,7 +25,7 @@
<view>{{toLocationCode}}</view> <view>{{toLocationCode}}</view>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>

2
src/pages/deliver/record/deliverRecord.vue

@ -13,7 +13,7 @@
@removePack="removePack"> @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/deliver/request/deliverRequestDetail.vue

@ -15,7 +15,7 @@
<view class="page-item"> <view class="page-item">
{{detailSource.customerCode}} {{detailSource.customerCode}}
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
<view class="detail-list" v-for="(item, index) in detailSource.subList" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource.subList" :key="item.id">
<view class=""> <view class="">

4
src/pages/inspect/coms/comInspectDetailCard.vue

@ -5,7 +5,7 @@
<template v-slot:title> <template v-slot:title>
<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty> <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions" <uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions"
@ -19,7 +19,7 @@
不合格原因 : {{item.FailedReason}} 不合格原因 : {{item.FailedReason}}
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>

2
src/pages/inspect/coms/comInspectJobList.vue

@ -4,7 +4,7 @@
<scroll-view scroll-y="true" > <scroll-view scroll-y="true" >
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-receipt-job-card :dataContent="item" @click='selectItem(item)'></com-receipt-job-card> <com-receipt-job-card :dataContent="item" @click='selectItem(item)'></com-receipt-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</uni-popup> </uni-popup>

8
src/pages/inspect/coms/inspectComDetailCard.vue

@ -25,10 +25,10 @@
<view style="color: #EC9C00">{{jobContent.crackQty}}{{getUomInfo(jobContent.uom)}}</view> <view style="color: #EC9C00">{{jobContent.crackQty}}{{getUomInfo(jobContent.uom)}}</view>
</view> </view>
</view> </view>
<!-- <u-line /> --> <!-- <view class='split_line'></view> -->
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<uni-collapse ref="collapse1" @change=""> <uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true"> <uni-collapse-item :open="true">
<template v-slot:title> <template v-slot:title>
@ -39,7 +39,7 @@
<batch :batch="jobContent.batch"></batch> <batch :batch="jobContent.batch"></batch>
</view> </view>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"
@ -77,7 +77,7 @@
</view> </view>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line /> <view class='split_line'></view>
</view> </view>
</uni-collapse-item> </uni-collapse-item>

2
src/pages/inspect/coms/inspectInfoPopup.vue

@ -62,7 +62,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</job-common-info> </job-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/inspect/coms/requestInfoPopup.vue

@ -5,7 +5,7 @@
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <comListItem :dataList="dataList"></comListItem>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/inspect/job/inspectResult.vue

@ -122,7 +122,7 @@
<view class=""> <view class="">
库位:{{item.fromLocationCode}} 库位:{{item.fromLocationCode}}
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</scroll-view> </scroll-view>

2
src/pages/inspect/request/inspectRequestDetail.vue

@ -11,7 +11,7 @@
<text>供应商代码 : {{requestContent.supplierCode}} </text> <text>供应商代码 : {{requestContent.supplierCode}} </text>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comRequestDetailCard :dataContent="item" <comRequestDetailCard :dataContent="item"

4
src/pages/inventoryMove/coms/comInventoryDetailCard.vue

@ -5,7 +5,7 @@
<template v-slot:title> <template v-slot:title>
<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty> <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions" <uni-swipe-action-item :right-options="item.scaned?scanOptions:detailOptions"
@ -14,7 +14,7 @@
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
</view> </view>
<u-line /> <view class='split_line'></view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit> <balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditStatus="true"></balance-qty-edit>

4
src/pages/inventoryMove/coms/comMove.vue

@ -4,7 +4,7 @@
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<u-line /> <view class='split_line'></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@ -14,7 +14,7 @@
:allowEditStatus="allowEditStatus"> :allowEditStatus="allowEditStatus">
</com-move-record> </com-move-record>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/inventoryMove/coms/comMoveRecord.vue

@ -4,7 +4,7 @@
<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view> <com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
</view> </view>
<view class="page-wraper" v-if="detailSource.length>0"> <view class="page-wraper" v-if="detailSource.length>0">
<u-line /> <view class='split_line'></view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

2
src/pages/inventoryMove/coms/comMoveRecordCard.vue

@ -21,7 +21,7 @@
:isShowLocation="true" :allowEditStatus='allowEditStatus'></comMovebalance> :isShowLocation="true" :allowEditStatus='allowEditStatus'></comMovebalance>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

2
src/pages/inventoryMove/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-inventory-job-card :dataContent="item" @click='selectItem(item)'></com-inventory-job-card> <com-inventory-job-card :dataContent="item" @click='selectItem(item)'></com-inventory-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/inventoryMove/job/inventoryMoveDetail.vue

@ -7,7 +7,7 @@
<view class="header_item"> <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">

4
src/pages/issue-按批次推荐/coms/comIssueDetailCard.vue

@ -3,7 +3,7 @@
<!-- 需求库位 --> <!-- 需求库位 -->
<requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode" <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> :isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation>
<u-line /> <view class='split_line'></view>
<view v-for="(item,index) in dataContent.Items"> <view v-for="(item,index) in dataContent.Items">
<uni-collapse ref="collapse"> <uni-collapse ref="collapse">
<uni-collapse-item :open="true"> <uni-collapse-item :open="true">
@ -11,7 +11,7 @@
<!-- 物品 --> <!-- 物品 -->
<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty> <item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view v-for="(loacation,index) in item.Locations"> <view v-for="(loacation,index) in item.Locations">
<view> <view>
<view class="uni-flex uni-row space-between"> <view class="uni-flex uni-row space-between">

2
src/pages/issue-按批次推荐/coms/comIssueRecommend.vue

@ -25,7 +25,7 @@
</view> </view>
</view> </view>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(record,index) in batch.Records"> <view class="" v-for="(record,index) in batch.Records">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,batch)"> <uni-swipe-action-item @click="swipeClick($event,batch)">

20
src/pages/issue/coms/comIssueDetailCard.vue

@ -2,11 +2,11 @@
<view> <view>
<!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode" <!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
:isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> --> :isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
<view v-for="(item,index) in dataContent.Items"> <view v-for="(item,index) in dataContent.Items">
<uni-collapse ref="collapse"> <uni-collapse ref="collapse">
<uni-collapse-item :open="true"> <uni-collapse-item :open="true">
<template v-slot:title> <template v-slot:title>
<view class="split_line"></view>
<!-- 物品 --> <!-- 物品 -->
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="itemCoceClick($event,item,index)" <uni-swipe-action-item @click="itemCoceClick($event,item,index)"
@ -17,7 +17,8 @@
<!-- <com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent"> <!-- <com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
</com-issue-request-info> --> </com-issue-request-info> -->
</template> </template>
<u-line />
<view v-for="(loacation,index) in item.Locations"> <view v-for="(loacation,index) in item.Locations">
<view> <view>
<view class="uni-flex uni-row space-between"> <view class="uni-flex uni-row space-between">
@ -30,7 +31,8 @@
:isShowPack="batch.packingNumber!=null && batch.packingNumber!=''"> :isShowPack="batch.packingNumber!=null && batch.packingNumber!=''">
</recommend-balance> </recommend-balance>
<view class="uni-flex uni-row " v-if='batch.Records.length>0'> <view class="uni-flex uni-row " v-if='batch.Records.length>0'>
<view class="center " style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px;padding: 0px 2px;"> <view class="center "
style=" width: 20px;background-color: #0CC2B6; color: #fff; margin-left: 40px;padding: 0px 2px;">
扫描 扫描
</view> </view>
<view class="uni-flex uni-column scan_view" style="width: 100%;"> <view class="uni-flex uni-column scan_view" style="width: 100%;">
@ -77,7 +79,7 @@
} from '@/common/array.js'; } from '@/common/array.js';
export default { export default {
emits: ['updateData',"removeItemCode"], emits: ['updateData', "removeItemCode"],
components: { components: {
itemQty, itemQty,
recommend, recommend,
@ -112,7 +114,7 @@
batchItem: {}, batchItem: {},
detailOptions: [], detailOptions: [],
scanOptions: [], scanOptions: [],
removeOptions:[] removeOptions: []
} }
}, },
@ -141,12 +143,12 @@
this.remove(batch, record, index) this.remove(batch, record, index)
} }
}, },
itemCoceClick(e,item,index){ itemCoceClick(e, item, index) {
if (e.content.text == "移除") { if (e.content.text == "移除") {
this.dataContent.Items.splice(index, 1); this.dataContent.Items.splice(index, 1);
this.$emit('removeItemCode') this.$emit('removeItemCode')
} }
}, },
edit(batch, item) { edit(batch, item) {
@ -185,4 +187,4 @@
</script> </script>
<style> <style>
</style> </style>

7
src/pages/issue/coms/comIssueJobCard.vue

@ -1,12 +1,15 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <view class="task_item">
<view class="task_text"> <!-- <view class="task_text">
申请单号 {{dataContent.requestNumber}} 申请单号 {{dataContent.requestNumber}}
</view> </view> -->
<view class="task_text"> <view class="task_text">
车间 {{dataContent.workShopCode}} 车间 {{dataContent.workShopCode}}
</view> </view>
<view class="task_text">
生产线 {{dataContent.workShopCode}}
</view>
</view> </view>
</job-com-main-card> </job-com-main-card>
</template> </template>

2
src/pages/issue/coms/comIssueRecommend.vue

@ -25,7 +25,7 @@
</view> </view>
</view> </view>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(record,index) in batch.Records"> <view class="" v-for="(record,index) in batch.Records">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,batch)"> <uni-swipe-action-item @click="swipeClick($event,batch)">

2
src/pages/issue/coms/comIssueRequestCreator.vue

@ -11,7 +11,7 @@
<uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="options"> <uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="options">
<item-qty :dataContent="item" :isShowStdPack="false"> <item-qty :dataContent="item" :isShowStdPack="false">
</item-qty> </item-qty>
<u-line /> <view class='split_line'></view>
</uni-swipe-action-item> </uni-swipe-action-item>
</view> </view>
</uni-swipe-action> </uni-swipe-action>

2
src/pages/issue/coms/comIssueRequestDetailCard.vue

@ -10,7 +10,7 @@
<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions"> <uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
<item-qty :dataContent="item" :isShowStdPack="false"> <item-qty :dataContent="item" :isShowStdPack="false">
</item-qty> </item-qty>
<u-line /> <view class='split_line'></view>
</uni-swipe-action-item> </uni-swipe-action-item>
</view> </view>

10
src/pages/issue/coms/comIssueRequestPopup.vue

@ -10,7 +10,7 @@
<image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg" <image style="width: 35rpx;height: 35rpx;" src="/static/icons/icons_close.svg"
@click="closeRequestPopup()"></image> @click="closeRequestPopup()"></image>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-column" style="background-color: white; "> <view class="uni-flex uni-column" style="background-color: white; ">
<view class="uni-flex uni-column "> <view class="uni-flex uni-column ">
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
@ -24,7 +24,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
<text>位置</text> <text>位置</text>
<view class="uni-flex u-col-center uni-row" @click="showSelect"> <view class="uni-flex u-col-center uni-row" @click="showSelect">
@ -35,7 +35,7 @@
@confirm="confirmSelect"></u-select> @confirm="confirmSelect"></u-select>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="title padding" style="display: flex;"> <view class="title padding" style="display: flex;">
<text style=" flex-shrink: 0;">物料</text> <text style=" flex-shrink: 0;">物料</text>
@ -49,7 +49,7 @@
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
<view class="uni-flex uni-row padding title u-col-center"> <view class="uni-flex uni-row padding title u-col-center">
<text>数量 </text> <text>数量 </text>
<view class="uni-flex uni-row uni-center" <view class="uni-flex uni-row uni-center"
@ -66,7 +66,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</view> </view>
</view> </view>

2
src/pages/issue/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-issue-job-card :dataContent="item" @click='selectItem(item)'></com-issue-job-card> <com-issue-job-card :dataContent="item" @click='selectItem(item)'></com-issue-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/issue/coms/requestInfoPopup.vue

@ -5,7 +5,7 @@
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <comListItem :dataList="dataList"></comListItem>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

5
src/pages/issue/job/issueDetail.vue

@ -4,9 +4,9 @@
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<view class="header_item"> <!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view> -->
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -17,6 +17,7 @@
</work-station> </work-station>
<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'> <com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
</com-issue-detail-card> </com-issue-detail-card>
<view class="split_line"></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/package/coms/comOverPackJobDetailCard.vue

@ -17,7 +17,7 @@
<!-- <com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent"> <!-- <com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
</com-issue-request-info> --> </com-issue-request-info> -->
</template> </template>
<u-line /> <view class='split_line'></view>
<view v-for="(loacation,index) in item.Locations" :key="index"> <view v-for="(loacation,index) in item.Locations" :key="index">
<view> <view>
<view class="uni-flex uni-row space-between"> <view class="uni-flex uni-row space-between">

6
src/pages/package/job/overPackageJobDetail.vue

@ -4,9 +4,9 @@
<view class="header_job_top"> <view class="header_job_top">
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<view class="header_item"> <!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view> -->
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -26,7 +26,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line /> <view class="split_line"></view>
</view> </view>
<comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation" <comOverPackJobDetailCard ref='comOverPackJobDetailCard' :dataContent="toLocation"

2
src/pages/package/record/mergePackageRecord.vue

@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/package/record/overPackageRecord.vue

@ -30,7 +30,7 @@
:isShowFromLocation="false" :isShowToLocation="false"> :isShowFromLocation="false" :isShowToLocation="false">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/productDismantle/coms/comProductDetailCard.vue

@ -5,7 +5,7 @@
<template v-slot:title> <template v-slot:title>
<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty> <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"

4
src/pages/productDismantle/coms/comProductRecord.vue

@ -11,7 +11,7 @@
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"
@ -22,7 +22,7 @@
</purchase-label> </purchase-label>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
</view> </view>
</uni-collapse-item> </uni-collapse-item>
</uni-collapse> </uni-collapse>

2
src/pages/productDismantle/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card> <com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/productDismantle/coms/requestInfoPopup.vue

@ -36,7 +36,7 @@
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

4
src/pages/productDismantle/job/productDismantleDetail.vue

@ -7,7 +7,7 @@
<view class="header_item"> <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
<u-line color="#D8D8D8"></u-line> <view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -17,7 +17,7 @@
@remove="updateData" @updateData="updateData" @openDetail="openDetail"> @remove="updateData" @updateData="updateData" @openDetail="openDetail">
</com-detail-card> </com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/productDismantle/record/productDismantleRecord.vue

@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/productPutaway/coms/comProductDetailCard.vue

@ -5,7 +5,7 @@
<template v-slot:title> <template v-slot:title>
<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty> <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"

2
src/pages/productPutaway/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card> <com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/productPutaway/coms/requestInfoPopup.vue

@ -5,7 +5,7 @@
<view class=""> <view class="">
<comListItem :dataList="dataList"></comListItem> <comListItem :dataList="dataList"></comListItem>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</request-common-info> </request-common-info>
</uni-popup> </uni-popup>
</view> </view>

3
src/pages/productPutaway/job/productPutawayDetail.vue

@ -7,7 +7,7 @@
<view class="header_item"> <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
<u-line color="#D8D8D8" /> <view class='split_line'></view>
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">
@ -18,7 +18,6 @@
:locationAreaTypeList='toLocationAreaTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</com-detail-card> </com-detail-card>
</view> </view>
<u-line />
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/productPutaway/record/productPutawayRecord.vue

@ -13,7 +13,7 @@
@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"> @removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
</record-com-detail-card> </record-com-detail-card>
</view> </view>
<u-line /> <view class='split_line'></view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>

2
src/pages/productPutaway/request/putawayRequestDetail.vue

@ -7,7 +7,7 @@
<!-- <view class="header_item"> <!-- <view class="header_item">
供应商 : {{requestContent.supplierCode}} 供应商 : {{requestContent.supplierCode}}
</view> --> </view> -->
<u-line color="#D8D8D8" /> <view class="split_line"></view>
</view> </view>
<view class="page-main"> <view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll"> <scroll-view scroll-y="true" class="page-main-scroll">

6
src/pages/productReceipt/coms/comProductDetailCard.vue

@ -5,19 +5,17 @@
<template v-slot:title> <template v-slot:title>
<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty> <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"></itemCompareQty>
</template> </template>
<view class="split_line"></view>
<view class="" v-for="(item,index) in dataContent.subList" :key="index"> <view class="" v-for="(item,index) in dataContent.subList" :key="index">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions"> :right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :isShowFromLocation="false" <recommend :detail="item" :isShowFromLocation="false"
:isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend> :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<view v-if="item.fgList!=undefined && item.fgList.length>0" class="card_view" <view v-if="item.fgList!=undefined && item.fgList.length>0" class="card_view"
style="margin-left: 20px;" style="margin-left: 20px;" v-for="(fg, index) in item.fgList" :key="index">
v-for="(fg, index) in item.fgList" :key="index">
<com-fg-card :detail='fg'></com-fg-card> <com-fg-card :detail='fg'></com-fg-card>
</view> </view>
</view> </view>

100
src/pages/productReceipt/coms/comProductJobCard.vue

@ -1,50 +1,60 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
申请单号 : {{dataContent.requestNumber}} 申请单号 : {{dataContent.requestNumber}}
</view> </view>
</view> </view>
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
车间代码 : {{dataContent.workShopCode}} 计划单号 : {{dataContent.productionPlanNumber}}
</view> </view>
</view> </view>
<view class="task_text">
<view class="task_text"> <view class="">
车间代码 : {{dataContent.workShopCode}}
</view>
</view>
<!-- <view class="task_text">
<view class=""> <view class="">
班组 : {{dataContent.team}} 班组 : {{dataContent.team}}
</view> </view>
</view> </view>
</view> <view class="task_text">
</job-com-main-card> <view class="">
</template> 班次 : {{dataContent.shift}}
</view>
<script> </view> -->
import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' </view>
export default { </job-com-main-card>
components: { </template>
jobComMainCard,
}, <script>
data() { import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
return {}; export default {
}, components: {
jobComMainCard,
props: { },
dataContent: { data() {
type: Object, return {};
default: {} },
},
}, props: {
dataContent: {
methods: { type: Object,
default: {}
} },
} },
</script>
methods: {
<style lang="scss">
}
</style> }
</script>
<style lang="scss">
</style>

2
src/pages/productReceipt/coms/comProductRecord.vue

@ -11,7 +11,7 @@
</uni-swipe-action> </uni-swipe-action>
</template> </template>
<u-line /> <view class='split_line'></view>
<view class="" v-for="(item,index) in dataContent.subList"> <view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction"> <uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item,index)" <uni-swipe-action-item @click="swipeClick($event,item,index)"

2
src/pages/productReceipt/coms/jobInfoPopup.vue

@ -22,7 +22,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
</job-common-info> </job-common-info>
</uni-popup> </uni-popup>
</view> </view>

2
src/pages/productReceipt/coms/jobListPopup.vue

@ -3,7 +3,7 @@
<com-popup @onClose="closePopup"> <com-popup @onClose="closePopup">
<view v-for="(item, index) in receiptList" :key="index"> <view v-for="(item, index) in receiptList" :key="index">
<com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card> <com-product-job-card :dataContent="item" @click='selectItem(item)'></com-product-job-card>
<u-line></u-line> <view class='split_line'></view>
</view> </view>
</com-popup> </com-popup>
</uni-popup> </uni-popup>

2
src/pages/productReceipt/coms/productDetailInfoPopup.vue

@ -15,7 +15,7 @@
</view> </view>
</view> </view>
<u-line></u-line> <view class='split_line'></view>
<view class=""> <view class="">
<view class="uni-flex uni-column"> <view class="uni-flex uni-column">
<view class="item"> <view class="item">

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save