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 10 months ago
parent
2d70008921 bd9a271650
commit
2b2efb03f1
20 changed files with 48 additions and 83 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. 0
      common/style/PDA_style-delete.css
  2. 5
      common/style/new_style.css
  3. 21
      mycomponents/detail/comDetailCard.vue
  4. 2
      pages/deliver/job/deliverDetail.vue
  5. 35
      pages/index/index.vue
  6. 2
      pages/inventoryMove/job/inventoryMoveDetail.vue
  7. 2
      pages/productDismantle/job/productDismantleDetail.vue
  8. 5
      pages/productPutaway/job/productPutawayDetail.vue
  9. 4
      pages/productReceipt/job/productReceiptDetail.vue
  10. 2
      pages/productionReceipt/job/productionReceiptDetail.vue
  11. 4
      pages/productionReturn/job/returnDetail.vue
  12. 4
      pages/purchaseReceipt/job/receiptDetail.vue
  13. 16
      pages/purchaseReturn/job/returnDetail.vue
  14. 5
      pages/putaway/job/putawayDetail.vue
  15. 4
      pages/repleinsh/job/repleinshDetail.vue
  16. 4
      pages/scrap/job/scrapJobDetail.vue
  17. 4
      pages/transfer/job/receiptDetail.vue
  18. 4
      pages/transfer/job/transferDetail.vue
  19. 4
      pages/unPlanned/job/issueJobDetail.vue
  20. 4
      pages/unPlanned/job/receiptJobDetail.vue

0
common/style/PDA_style.css → common/style/PDA_style-delete.css
View File

5
common/style/new_style.css
View File

@ -2100,7 +2100,7 @@ button::after {
}
.card_location {
color: #00A3FF;
color: #DA8910;
padding: 5px;
}
@ -2118,7 +2118,8 @@ button::after {
}
.scan_view {
background: linear-gradient(to right, #7ED7BD, #DCEFEE);
background: linear-gradient(90deg, rgba(12, 194, 182, 0.2) 0%, rgba(12, 194, 182, 0) 100%)
}
.card_view {

21
mycomponents/detail/comDetailCard.vue
View File

@ -1,41 +1,20 @@
<template>
<view class="" style="background-color: #fff;">
<!-- <view class="cell_box uni-flex uni-row">
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{workShopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{dataContent.productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ dataContent.workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库</view>
<view>{{ dataContent.toLocationCode}}</view>
</view>
</view> -->
<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>
</template>
<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">
<recommend :detail="item" :isShowToLocation="false">
</recommend>
<u-line />
</uni-swipe-action-item>
</uni-swipe-action>
</view>
</uni-collapse-item>
</uni-collapse>
<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>

2
pages/deliver/job/deliverDetail.vue
View File

@ -7,7 +7,7 @@
<view class="header_item" >
申请单号：{{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<u-line color="#D8D8D8"></u-line>
<view class="cen_card" style="padding: 5rpx;">
<view class="cell_box uni-flex uni-row">
<view class="cell_info">

35
pages/index/index.vue
View File

@ -22,11 +22,14 @@
<text>{{item.name}}</text>
</view>
<view class="item-container">
<view class="thumb-box" v-for="(item1, index1) in item.children" :key="index1"
@click="openCheck(item1.path)">
<view class="" style="position: relative; ">
<u-badge v-if="item1.count>0" type="error" :count="item1.count" :offset="position" :showZero ="false"></u-badge>
<!-- <u-badge class="item-menu-badge" v-if="item1.count>0" type="error" :count="item1.count" :offset="position"
:showZero="false"></u-badge> -->
<text class="item-menu-badge"
v-if="item1.count>0">{{item1.count>9?'9+':item1.count}}</text>
<image class="item-menu-image" :src="'/static/menus/'+item1.componentName" mode="">
</image>
<view class="">
@ -169,30 +172,30 @@
this.timer = setInterval(function() {
that.getMainMessage();
console.log('刷新菜单');
}, 1000*60)
}, 1000 * 60)
},
stopRefresh(){
stopRefresh() {
if (this.timer) {
clearInterval(this.timer);
this.timer = null;
}
},
getMainMessage(){
getMainMessage() {
getMainMessage().then(res => {
this.menusCount = res.data;
this.tabbar.forEach(item=>{
item.children.forEach(rightItem=>{
this.tabbar.forEach(item => {
item.children.forEach(rightItem => {
var count = this.menusCount[rightItem.component]
if(count!=undefined){
rightItem.count =count;
if (count != undefined) {
rightItem.count = count;
}
})
})
this.$forceUpdate()
this.$forceUpdate()
});
},
findList(tab) {
let res = null
for (let i = 0; i < tab.length; i++) {
@ -472,7 +475,13 @@
height: 32px;
}
.index_badge {
.item-menu-badge {
width: 42rpx;
height: 42rpx;
top: -5px;
right: -5px;
font-size: 0.6rem;
background-color: #fa3534;
position: absolute;
right: 0;
color: #fff;

2
pages/inventoryMove/job/inventoryMoveDetail.vue
View File

@ -7,7 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<u-line color="#D8D8D8"></u-line>
</view>
<view class="page-main">

2
pages/productDismantle/job/productDismantleDetail.vue
View File

@ -7,7 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<u-line color="#D8D8D8"></u-line>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">

5
pages/productPutaway/job/productPutawayDetail.vue
View File

@ -7,10 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8" >
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/productReceipt/job/productReceiptDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

2
pages/productionReceipt/job/productionReceiptDetail.vue
View File

@ -8,7 +8,7 @@
<view class="header_item">
发料任务单号 : {{jobContent.issueJobNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<u-line color="#D8D8D8"></u-line>
</view>
<scroll-view scroll-y="true">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

4
pages/productionReturn/job/returnDetail.vue
View File

@ -12,9 +12,7 @@
:workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.fromLocationCode">
</work-station>
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<u-line color="#D8D8D8" l-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">
<comReturnDetailCard :dataContent="item" :index="index" :settingParam="jobContent"

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

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

16
pages/purchaseReturn/job/returnDetail.vue
View File

@ -7,17 +7,15 @@
<view class="header_item">
发货单：{{jobContent.asnNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
<u-line color="#D8D8D8" ></u-line>
</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="">
<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
@updateData='updateData' @openDetail="openDetail">
</com-detail-card>
</view>
<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
@updateData='updateData' @openDetail="openDetail">
</com-detail-card>
</view>
</scroll-view>
</view>
@ -239,10 +237,12 @@
r.batch == batch && r.fromLocationCode == result.fromLocationCode
})
if (itemDetail == undefined) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】不在列表中")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else {
if (itemDetail.scaned) {
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【"+result.fromLocationCode+"】已经扫描")
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】已经扫描")
} else {
let balanceStatus = getInventoryStatusName(result.balance.inventoryStatus);
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);

5
pages/putaway/job/putawayDetail.vue
View File

@ -7,10 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8" n">
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/repleinsh/job/repleinshDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="">
<view v-for="(toLocation, index) in detailSource">
<com-repleish-detail-card ref='comIssueDetailCard' :dataContent="toLocation"

4
pages/scrap/job/scrapJobDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/transfer/job/receiptDetail.vue
View File

@ -10,9 +10,7 @@
<view class="header_item">
来源仓库 : {{jobContent.fromWarehouseCode}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/transfer/job/transferDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/unPlanned/job/issueJobDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

4
pages/unPlanned/job/receiptJobDetail.vue
View File

@ -7,9 +7,7 @@
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<u-line color="#D8D8D8" style="margin-bottom: 15rpx;margin-top: 10rpx;"></u-line>
</view>
<view class="page-main">
<u-line color="#D8D8D8"
<scroll-view scroll-y="true" class="page-main-scroll">
<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class="">

Write Preview
Loading…
Cancel
Save