lijuncheng 11 months ago
parent
commit
8f140767e8
  1. 2
      common/style/pdabasic.css
  2. 14
      mycomponents/detail/comDetailCard.vue
  3. 2
      mycomponents/recommend/recommend.vue
  4. 4
      pages/purchaseReceipt/job/receiptDetail.vue
  5. 1
      pages/putaway/job/putawayDetail.vue
  6. 2
      uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

2
common/style/pdabasic.css

@ -473,7 +473,7 @@ export function getItemTypeStyle(val) {
.detail-list {
background-color: #fff;
padding: 10rpx;
padding:5rpx 10rpx;
/* margin: 20rpx; */
/* border-radius: 16rpx; */
/* overflow: hidden; */

14
mycomponents/detail/comDetailCard.vue

@ -3,13 +3,15 @@
<uni-collapse ref="collapse1" @change="">
<uni-collapse-item :open="true">
<template v-slot:title>
<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)">
<item-compare-qty :dataContent="dataContent" :handleQty="Number(dataContent.handleQty)" :isShowStdPack="false">
</item-compare-qty>
</template>
<u-line></u-line>
<view class="" v-for="(item,index) in dataContent.subList">
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions">
:right-options="item.scaned?scanOptions:detailOptions"
style='padding:0px 0px 5px 0px;align-items: center;'>
<recommend :detail="item" :isShowToLocation="false">
</recommend>
</uni-swipe-action-item>
@ -36,7 +38,7 @@
} from '@/common/array.js';
export default {
emits: ['openDetail',"updateData"],
emits: ['openDetail', "updateData"],
components: {
itemCompareQty,
recommend,
@ -78,7 +80,7 @@
return {
option: [],
showItem: {},
locatonItem:{},
locatonItem: {},
editItem: {},
detailOptions: [],
scanOptions: []
@ -101,7 +103,7 @@
this.detail(item)
} else if (e.content.text == "编辑") {
this.edit(item)
} else if (e.content.text == "库位") {
} else if (e.content.text == "库位") {
this.showLocation(item)
} else if (e.content.text == "移除") {
this.remove(item)
@ -139,7 +141,7 @@
},
//
getLocation(location, code) {
this.locatonItem.toLocationCode =code;
this.locatonItem.toLocationCode = code;
this.$emit('updateData')
},
}

2
mycomponents/recommend/recommend.vue

@ -1,5 +1,5 @@
<template>
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; margin-bottom: 1px;">
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
<view class="uni-flex uni-row space-between" style="align-items: center">
<!-- uni-inline-item 暂时拿掉-->
<view>

4
pages/purchaseReceipt/job/receiptDetail.vue

@ -7,7 +7,9 @@
<view class="header_item">
发货单号 : {{jobContent.asnNumber}}
</view>
<u-line color="#D8D8D8" />
<u-line color="#D8D8D8" />
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

1
pages/putaway/job/putawayDetail.vue

@ -19,7 +19,6 @@
:locationTypeList='tolocationTypeList'>
</com-detail-card>
</view>
<u-line />
</view>
</scroll-view>
</view>

2
uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue

@ -210,7 +210,7 @@
this.height = data.height + 1
// #endif
// #ifndef APP-NVUE
this.height = data.height+3
this.height = data.height
// #endif
this.isheight = true
if (type) return

Loading…
Cancel
Save