sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

wms3.0_pda
lijuncheng 12 months ago
parent
7726a1c809 de32199ca5
commit
6c7b593c8c
9 changed files with 43 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      common/style/new_style.css
  2. 9
      common/style/uni.css
  3. 6
      mycomponents/balance/batch.vue
  4. 6
      mycomponents/balance/location.vue
  5. 6
      mycomponents/balance/pack.vue
  6. 1
      mycomponents/qty/stdPackQty.vue
  7. 33
      mycomponents/recommend/recommend.vue
  8. 2
      pages/purchaseReceipt/coms/comReceiptDetailCard.vue
  9. 1
      pages/purchaseReceipt/job/receiptDetail.vue

23
common/style/new_style.css
View File

@ -2047,6 +2047,12 @@ button::after {
font-size: 30rpx;
}
*/
.card_content {
font-size: 32rpx;
}
.card_icon_normal {
width: 45rpx;
height: 45rpx;
@ -2054,7 +2060,6 @@ button::after {
}
.card_packing_code {
font-size: 32rpx;
color: #3315EB;
}
@ -2062,10 +2067,8 @@ button::after {
font-size: 32rpx;
}
.card_batch {
color: #00B574;
font-size: 32rpx;
}
@ -2075,7 +2078,6 @@ button::after {
.card_business {
color: #F1A532;
font-size: 32rpx;
}
.card_business_content {
@ -2086,9 +2088,12 @@ button::after {
color: #00A3FF;
}
.card_location_content {
font-size: 32rpx;
}
.card_supportCode {
color: #DA8910;
font-size: 32rpx;
}
.card_supportCode_content {
@ -2099,6 +2104,12 @@ button::after {
background: linear-gradient(to right, #7ED7BD, #DCEFEE);
}
.card_view
{
font-size: 32rpx;
padding: 5rpx;
}
/*
.pack_view {
font-size: 32rpx;
padding: 5rpx;
@ -2113,7 +2124,7 @@ button::after {
font-size: 32rpx;
padding: 5rpx;
}
*/
.business_view {
font-size: 32rpx;
padding: 5rpx;

9
common/style/uni.css
View File

@ -61,17 +61,16 @@ form {
display: flex;
flex-direction: row;
align-items: center;
}
.uni-inline-item text {
/* .uni-inline-item text {
margin-right: 20rpx;
}
.uni-inline-item text:last-child {
*/
/* .uni-inline-item text:last-child {
margin-right: 0rpx;
margin-left: 20rpx;
}
} */
/* page */
.common-page-head {

6
mycomponents/balance/batch.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="batch_view uni-inline-item">
<text class="card_batch">批次</text>
<text class="card_batch_content">{{batch}}</text>
<view class="card_view uni-inline-item">
<text class="card_batch card_content ">批次</text>
<text class="card_content ">{{batch}}</text>
</view>
</template>

6
mycomponents/balance/location.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="location_view uni-inline-item">
<text class="card_location">{{title}}</text>
<text>{{locationCode}}</text>
<view class="card_view uni-inline-item">
<text class="card_location card_content ">{{title}}</text>
<text class="card_content ">{{locationCode}}</text>
</view>
</template>

6
mycomponents/balance/pack.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="pack_view uni-inline-item">
<text class="card_packing_code">箱码</text>
<text class="card_packing_code_content">{{packingCode}}</text>
<view class="card_view uni-inline-item">
<text class="card_packing_code card_content ">箱码</text>
<text class="card_content ">{{packingCode}}</text>
</view>
</template>

1
mycomponents/qty/stdPackQty.vue
View File

@ -3,7 +3,6 @@
<text>
{{Number(dataContent.stdPackQty)}}•{{getStdPackUnit(dataContent.uom)}}
</text>
<!-- dataContent.StdPackUom -->
</view>
</template>
<script>

33
mycomponents/recommend/recommend.vue
View File

@ -1,20 +1,14 @@
<template>
<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff;">
<view class="uni-flex uni-row space-between uni-inline-item">
<view class="uni-flex uni-row space-between ">
<!-- uni-inline-item 暂时拿掉-->
<view>
<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
<batch v-if="isShowBatch" :batch="detail.batch"></batch>
<location v-if="isShowFromLocation"
title="来源库位"
:locationCode="detail.fromLocationCode">
<location v-if="isShowLocation" title="来源库位" :locationCode="detail.fromLocationCode">
</location>
<location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
</location>
<view class="">
<location v-if="isShowToLocation&&detail.toLocationCode!=null"
title="目标库位"
:locationCode="detail.toLocationCode">
</location>
</view>
</view>
<view>
<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
@ -22,13 +16,10 @@
<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
</compare-qty>
<view class="" style="font-size: 40rpx;">
<!-- <u-button @click="copy" size="mini" >复制采购标签</u-button> -->
<text style="font-size: 10rpx;color: #2979ff;" @click="copy">复制采购标签</text>
</view>
<view class="" style="font-size: 40rpx;">
<!-- <u-button @click="copyPro" size="mini" type="primary" >复制制造标签</u-button> -->
<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">复制制品标签</text>
<view class="uni-flex uni-row" style="vertical-align:center">
<text style="font-size: 10rpx;color: #2979ff; "
@click="copy">复制采购</text>
<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">|制品</text>
</view>
</view>
</view>
@ -69,7 +60,7 @@
type: Boolean,
default: true
},
isShowFromLocation: {
isShowLocation: {
type: Boolean,
default: true
},
@ -95,7 +86,7 @@
this.$copyText(content).then(
res => {
uni.showToast({
title: '复制成功',
title: '复制采购标签成功',
icon: 'none'
})
}
@ -108,7 +99,7 @@
this.$copyText(content).then(
res => {
uni.showToast({
title: '复制成功',
title: '复制制品标签成功',
icon: 'none'
})
}

2
pages/purchaseReceipt/coms/comReceiptDetailCard.vue
View File

@ -10,7 +10,7 @@
<uni-swipe-action ref="swipeAction">
<uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
<recommend :detail="item" :isShowLocation="false" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
</uni-swipe-action-item>
</uni-swipe-action>
<u-line color="#D8D8D8"></u-line>

1
pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -13,7 +13,6 @@
</scroll-view>
</view>
<view class="page-footer">
<view class="uni-flex u-col-center space-between padding_10"
style="background-color:ghostwhite; width: 100%; ">

Write Preview
Loading…
Cancel
Save