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

增加样式2024/8/1 00:17:33

hella_vue3
zhang_li 2 months ago
parent
38fe15dd4a
commit
9fb38ff589
10 changed files with 64 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/mycomponents/job/jobComMainDetailCard.vue
  2. 47
      src/mycomponents/workStation/workStation.vue
  3. 22
      src/pages/count/coms/comFuzzyCountJobCard.vue
  4. 4
      src/pages/deliver/coms/comDeliverJobCard.vue
  5. 2
      src/pages/deliver/job/deliverJob.vue
  6. 10
      src/pages/issue/coms/comIssueJobCard.vue
  7. 8
      src/pages/issue/coms/comIssueRequestCard.vue
  8. 9
      src/pages/issue/job/issueDetail.vue
  9. 3
      src/pages/issue/request/issueRequestDetail.vue
  10. 3
      src/pages/putaway/job/putawayDetail.vue

6
src/mycomponents/job/jobComMainDetailCard.vue
View File

@ -7,13 +7,9 @@
<batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch> <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
<div class="u-flex justify-between u-p-b-16"> <div class="u-flex justify-between u-p-b-16">
<location v-if="isShowFromLocation && dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location> <location v-if="isShowFromLocation && dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
<level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== underfind && dataContent.priority !== null"> </level> <level title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined && dataContent.priority !== null"> </level>
<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode || dataContent.locationCode"> </to-location> <to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode || dataContent.locationCode"> </to-location>
</div> </div>
<view class="card_view" v-if="isShowDeliverType">
<text class="card_packing_code card_content">发货类型</text>
<text class="card_content">{{ dataContent.deliverType == 'CUST' ? '寄售库发货' : '三方库发货' }}</text>
</view>
</div> </div>
</view> </view>
</view> </view>

47
src/mycomponents/workStation/workStation.vue
View File

@ -1,33 +1,26 @@
<template> <template>
<view class="header_job_top"> <view class="cen_card">
<view class="cen_card"> <view class="cell_box uni-flex uni-row">
<view class="cell_box uni-flex uni-row"> <view class="cell_info">
<view class="cell_info" v-if="fromWarehouseCode != ''"> <view class="text_lightblue">车间</view>
<view class="text_lightblue">仓库</view> <view>{{ workshopCode }}</view>
<view>{{ fromWarehouseCode }}</view> </view>
</view> <view class="cell_info">
<view class="text_lightblue">生产线</view>
<view class="cell_info"> <view>{{ productionLineCode }}</view>
<view class="text_lightblue">车间</view> </view>
<view>{{ workshopCode }}</view> <view class="cell_info">
</view> <view class="text_lightblue">工位</view>
<view class="cell_info"> <view>{{ workStationCode }}</view>
<view class="text_lightblue">生产线</view> </view>
<view>{{ productionLineCode }}</view> <view class="cell_info">
</view> <view class="text_lightblue">原料库位</view>
<view class="cell_info"> <view>{{ rawLocationCode }}</view>
<view class="text_lightblue">工位</view> </view>
<view>{{ workStationCode }}</view> <!-- <view class="cell_info">
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库位</view>
<view>{{ rawLocationCode }}</view>
</view>
<!-- <view class="cell_info">
<view class="text_lightblue">成品库位</view> <view class="text_lightblue">成品库位</view>
<view>{{ fgLocationCode }}</view> <view>{{ fgLocationCode }}</view>
</view> --> </view> -->
</view>
</view> </view>
</view> </view>
</template> </template>
@ -65,6 +58,6 @@ const props = defineProps({
<style scoped> <style scoped>
.cell_info { .cell_info {
flex: 1; flex: 1;
width:0px width: 0px;
} }
</style> </style>

22
src/pages/count/coms/comFuzzyCountJobCard.vue
View File

@ -1,14 +1,20 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<view class="card_view"> <view class="task_item" style="border-top: 1px solid #dedede; padding-top: 20rpx; margin-top: 20rpx">
<text class="card_packing_code">盘点计划</text> <view class="task_text">
<text class="card_content">{{ dataContent.planNumber }}</text>
</view>
<view v-if="dataContent.countRange != undefined" class="">
<view v-for="(range, index) in dataContent.countRange" :key="index">
<view class="card_view"> <view class="card_view">
<text class="card_packing_code">{{ getCountScopeName(range.type) }}</text> <text class="card_packing_code">盘点计划</text>
<text class="card_content">{{ range.value }}</text> <text class="card_content">{{ dataContent.planNumber }}</text>
</view>
</view>
<view v-if="dataContent.countRange != undefined" class="">
<view class="task_text">
<view v-for="(range, index) in dataContent.countRange" :key="index">
<view class="card_view">
<text class="card_packing_code">{{ getCountScopeName(range.type) }}</text>
<text class="card_content">{{ range.value }}</text>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>

4
src/pages/deliver/coms/comDeliverJobCard.vue
View File

@ -1,6 +1,10 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :isShowDeliverType="isShowDeliverType" :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :isShowDeliverType="isShowDeliverType" :dataContent="dataContent"></jobComMainDetailCard>
<view class="card_view" style="margin-left: 10px">
<text class="card_packing_code">发货类型</text>
<text class="card_content">{{ dataContent.deliverType == 'CUST' ? '寄售库发货' : '三方库发货' }}</text>
</view>
</job-com-main-card> </job-com-main-card>
</template> </template>

2
src/pages/deliver/job/deliverJob.vue
View File

@ -4,7 +4,7 @@
<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"> </job-filter> <job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"> </job-filter>
<view v-if="jobList.length > 0" class="u-m-20"> <view v-if="jobList.length > 0" class="u-m-20">
<u-swipe-action :show="item.show" :index="index" v-for="(item, index) in jobList" :key="index" :options="item.status == '2' ? detailGiveupOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="swipeClick"> <u-swipe-action :show="item.show" :index="index" v-for="(item, index) in jobList" :key="index" :options="item.status == '2' ? detailGiveupOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="swipeClick">
<com-deliver-job-card :isShowDeliverType="true" :dataContent="item" @click="openJobDetail(item)"></com-deliver-job-card> <com-deliver-job-card :dataContent="item" @click="openJobDetail(item)"></com-deliver-job-card>
</u-swipe-action> </u-swipe-action>
<job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup> <job-list-popup ref="jobListPopupRef" @selectedItem="selectedItem"></job-list-popup>
<job-info-popup ref="jobInfoPopupRef"></job-info-popup> <job-info-popup ref="jobInfoPopupRef"></job-info-popup>

10
src/pages/issue/coms/comIssueJobCard.vue
View File

@ -1,9 +1,13 @@
<template> <template>
<job-com-main-card :dataContent="dataContent"> <job-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class=""> <view class="task_item" style="margin-left: 15px">
<text style="font-size: 32rpx; margin-left: 35rpx">生产线</text> <view class="task_text">
<text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold">{{ dataContent.productionLineCode }}</text> <view class="card_view">
<text class="card_packing_code">生产线</text>
<text class="card_content">{{ dataContent.productionLineCode }}</text>
</view>
</view>
</view> </view>
</job-com-main-card> </job-com-main-card>
</template> </template>

8
src/pages/issue/coms/comIssueRequestCard.vue
View File

@ -1,6 +1,14 @@
<template> <template>
<request-com-main-card :dataContent="dataContent"> <request-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
<view class="task_item" style="margin-left: 15px">
<view class="task_text">
<view class="card_view">
<text class="card_packing_code">生产线</text>
<text class="card_content">{{ dataContent.productionLineCode }}</text>
</view>
</view>
</view>
</request-com-main-card> </request-com-main-card>
</template> </template>

9
src/pages/issue/job/issueDetail.vue
View File

@ -5,17 +5,20 @@
<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">
<work-station :workshopCode="jobContent.workShopCode" :productionLineCode="jobContent.detailProductionLineCode" :workStationCode="jobContent.detailWorkStationCode" :rawLocationCode="jobContent.detailToLocationCode"> </work-station>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> --> </view> -->
</view>
</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">
<view v-for="(toLocation, index) in detailSource"> <view v-for="(toLocation, index) in detailSource">
<view class="u-p-20"> <!-- <view class="u-p-20">
<work-station :workshopCode="jobContent.workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"> </work-station> <work-station :workshopCode="jobContent.workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"> </work-station>
</view> </view> -->
<com-issue-detail-card ref="comIssueDetailCardRef" :dataContent="toLocation" @updateData="updateData"> </com-issue-detail-card> <com-issue-detail-card ref="comIssueDetailCardRef" :dataContent="toLocation" @updateData="updateData"> </com-issue-detail-card>
<view class="split_line"></view> <view class="split_line"></view>
</view> </view>

3
src/pages/issue/request/issueRequestDetail.vue
View File

@ -4,11 +4,12 @@
<view class="page-header-box"> <view class="page-header-box">
<view class="header_job_top"> <view class="header_job_top">
<request-top :dataContent="requestContent"></request-top> <request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
<work-station :workshopCode="requestContent.workshopCode" :productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.toLocationCode"></work-station> <work-station :workshopCode="requestContent.workshopCode" :productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode" :rawLocationCode="titleInfo.toLocationCode"></work-station>
</view> </view>
</view> </view>
</view> </view>
<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"> <view class="detail-list">

3
src/pages/putaway/job/putawayDetail.vue
View File

@ -6,7 +6,6 @@
<job-top :dataContent="jobContent"></job-top> <job-top :dataContent="jobContent"></job-top>
</view> </view>
<view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view> <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
<view class="split_line"></view>
</view> </view>
</view> </view>
@ -33,7 +32,7 @@
<win-scan-button @goScan="openScanPopup"></win-scan-button> <win-scan-button @goScan="openScanPopup"></win-scan-button>
<!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult="getScanResult" :allowNullBalance="true"> </winScanPackAndLocationNoBalance> --> <!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult="getScanResult" :allowNullBalance="true"> </winScanPackAndLocationNoBalance> -->
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult="getScanResult" :noShowBalanceMessage="true"> </winScanPackAndLocation> <winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult="getScanResult" :noShowBalanceMessage="true"></winScanPackAndLocation>
<com-message ref="comMessageRef" /> <com-message ref="comMessageRef" />
</view> </view>
</template> </template>

Write Preview
Loading…
Cancel
Save