Browse Source

发料添加货架号

intex_online20241228
张立 2 months ago
parent
commit
59c98e7748
  1. 6
      src/common/style/new_style.css
  2. 9
      src/mycomponents/job/jobComMainDetailCard.vue
  3. 16
      src/mycomponents/workStation/workStation.vue
  4. 6
      src/pages/issue/coms/comIssueJobCard.vue
  5. 3
      src/pages/issue/job/issueDetailBatch.vue
  6. 2
      src/pages/issue/job/issueJob.vue

6
src/common/style/new_style.css

@ -2097,6 +2097,12 @@ button::after {
font-size: 30rpx; font-size: 30rpx;
} }
.card_packing_code1 {
color: rgb(24,173,240);
padding: 5px;
font-size: 30rpx;
}
.card_batch { .card_batch {
color: #9747FF; color: #9747FF;
padding: 5px; padding: 5px;

9
src/mycomponents/job/jobComMainDetailCard.vue

@ -9,6 +9,7 @@
></itemCompareQty> ></itemCompareQty>
<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" --> <!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
<div class="u-p-l-10"> <div class="u-p-l-10">
<goodsShelves v-if="isShowGoodsShelves && dataContent.itemGroup" :goodsShelves="dataContent.itemGroup"></goodsShelves>
<pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"> <pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber">
</pack> </pack>
<batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch> <batch v-if="isShowBatch && dataContent.batch" :batch="dataContent.batch"></batch>
@ -33,6 +34,7 @@
import toLocation from '@/mycomponents/balance/toLocation.vue' import toLocation from '@/mycomponents/balance/toLocation.vue'
import batch from '@/mycomponents/balance/batch.vue' import batch from '@/mycomponents/balance/batch.vue'
import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue' import intoDeliNo from '@/mycomponents/balance/intoDeliNo.vue'
import goodsShelves from '@/mycomponents/balance/goodsShelves.vue'
import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue' import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
import level from '@/mycomponents/balance/level.vue' import level from '@/mycomponents/balance/level.vue'
@ -44,7 +46,8 @@
batch, batch,
intoDeliNo, intoDeliNo,
itemCompareQty, itemCompareQty,
level level,
goodsShelves
}, },
data() { data() {
return {}; return {};
@ -91,6 +94,10 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
isShowGoodsShelves:{
type:Boolean,
default:false
}
}, },

16
src/mycomponents/workStation/workStation.vue

@ -22,10 +22,10 @@
<view class="text_lightblue">原料库位</view> <view class="text_lightblue">原料库位</view>
<view>{{ rawLocationCode }}</view> <view>{{ rawLocationCode }}</view>
</view> </view>
<!-- <view class="cell_info"> <view class="cell_info" v-if="isShowItemGroup">
<view class="text_lightblue">成品库位</view> <view class="text_lightblue">货架号</view>
<view>{{ fgLocationCode }}</view> <view>{{ itemGroup }}</view>
</view> --> </view>
</view> </view>
</view> </view>
</template> </template>
@ -65,6 +65,14 @@
type: String, type: String,
default: "" default: ""
}, },
itemGroup: {
type: String,
default: ""
},
isShowItemGroup: {
type: Boolean,
default: false
},
}, },
methods: {} methods: {}

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

@ -1,7 +1,7 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent" :isShowGoodsShelves='isShowGoodsShelves'></jobComMainDetailCard>
<view class="task_item" style="margin-left: 15px;"> <view class="task_item" style="margin-left: 15px;">
<view class="task_text"> <view class="task_text">
@ -36,6 +36,10 @@
type: Object, type: Object,
default: {} default: {}
}, },
isShowGoodsShelves:{
type:Boolean,
default:false
}
}, },
methods: { methods: {

3
src/pages/issue/job/issueDetailBatch.vue

@ -8,7 +8,8 @@
<work-station :workshopCode="jobContent.workShopCode" <work-station :workshopCode="jobContent.workShopCode"
:productionLineCode="jobContent.detailProductionLineCode" :productionLineCode="jobContent.detailProductionLineCode"
:workStationCode="jobContent.detailWorkStationCode" :workStationCode="jobContent.detailWorkStationCode"
:rawLocationCode="jobContent.detailToLocationCode"> :rawLocationCode="jobContent.detailToLocationCode"
:itemGroup="jobContent.itemGroup" :isShowItemGroup='true'>
</work-station> </work-station>
</view> </view>
</view> </view>

2
src/pages/issue/job/issueJob.vue

@ -14,7 +14,7 @@
:right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions" :right-options="item.status=='2'?detailGiveupOptions:item.status=='1'?detailCloseOptions:detailOptions"
@click="swipeClick($event,item)"> @click="swipeClick($event,item)">
<com-issue-job-card :dataContent="item" @click='openJobDetail(item)'></com-issue-job-card> <com-issue-job-card :dataContent="item" @click='openJobDetail(item)' :isShowGoodsShelves='true'></com-issue-job-card>
</uni-swipe-action-item> </uni-swipe-action-item>
</view> </view>

Loading…
Cancel
Save