Browse Source

增加样式

hella_online_20240829
niexiting 4 months ago
parent
commit
e118fa142e
  1. 2
      src/common/style/new_style.css
  2. 12
      src/common/style/pdabasic.css
  3. 10
      src/mycomponents/workStation/workStation.vue
  4. 18
      src/pages/issue/coms/comIssueRequestCard.vue
  5. 38
      src/pages/issue/job/issueDetail.vue
  6. 8
      src/pages/issue/request/issueRequestDetail.vue
  7. 4
      src/pages/purchaseReceipt/job/receiptDetail.vue
  8. 19
      src/pages/purchaseReturn/job/returnDetail.vue
  9. 5
      src/pages/purchaseReturn/request/returnRequestDetail.vue
  10. 30
      src/pages/putaway/job/putawayDetail.vue
  11. 9
      src/pages/putaway/request/putawayRequestDetail.vue

2
src/common/style/new_style.css

@ -2234,7 +2234,7 @@ button::after {
.task_item { .task_item {
margin: 0rpx 10rpx; margin: 0rpx 10rpx;
margin-top: 10rpx; /* margin-top: 10rpx; */
background-color: #fff; background-color: #fff;
} }

12
src/common/style/pdabasic.css

@ -725,18 +725,26 @@ page {
} }
.page-header { .page-header {
background-color: #3c9cff;
font-size: 35rpx;
padding: 10rpx 20rpx;
}
.page-header .header-view {
display: flex;
flex-direction: column;
background-color: #fff; background-color: #fff;
font-size: 35rpx; font-size: 35rpx;
padding: 10rpx 20rpx; padding: 10rpx 20rpx;
border-radius:4px;
} }
.page-header .header_item { .page-header .header-view .header_item {
/* padding-left: 10rpx; */ /* padding-left: 10rpx; */
padding: 5rpx 10rpx; padding: 5rpx 10rpx;
font-size:32rpx ; font-size:32rpx ;
} }
.page-header .header_job_top { .page-header .header-view .header_job_top {
padding:5rpx 0rpx; padding:5rpx 0rpx;
} }
.page-main { .page-main {

10
src/mycomponents/workStation/workStation.vue

@ -1,11 +1,10 @@
<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" v-if="fromWarehouseCode!=''"> <!-- <view class="cell_info" v-if="fromWarehouseCode!=''">
<view class="text_lightblue">仓库</view> <view class="text_lightblue">仓库</view>
<view>{{fromWarehouseCode}}</view> <view>{{fromWarehouseCode}}</view>
</view> </view> -->
<view class="cell_info"> <view class="cell_info">
<view class="text_lightblue">车间</view> <view class="text_lightblue">车间</view>
@ -20,7 +19,7 @@
<view>{{ workStationCode }}</view> <view>{{ workStationCode }}</view>
</view> </view>
<view class="cell_info"> <view class="cell_info">
<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">
@ -29,7 +28,6 @@
</view> --> </view> -->
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
@ -42,7 +40,7 @@
watch: {}, watch: {},
props: { props: {
fromWarehouseCode:{ fromWarehouseCode: {
type: String, type: String,
default: "" default: ""
}, },

18
src/pages/issue/coms/comIssueRequestCard.vue

@ -1,10 +1,18 @@
<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>
<script> <script>
import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue' import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue' import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default { export default {
@ -27,8 +35,8 @@
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
</style> </style>

38
src/pages/issue/job/issueDetail.vue

@ -1,20 +1,23 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<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"> <work-station :workshopCode="jobContent.workShopCode"
申请单号 : {{jobContent.requestNumber}} :productionLineCode="jobContent.detailProductionLineCode" :workStationCode="jobContent.detailWorkStationCode"
</view> --> :rawLocationCode="jobContent.detailToLocationCode">
</work-station>
</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">
<work-station :workshopCode="jobContent.workShopCode" <!-- <work-station :workshopCode="jobContent.workShopCode"
:productionLineCode="toLocation.productionLineCode" :productionLineCode="toLocation.productionLineCode"
:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"> :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode">
</work-station> </work-station> -->
<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'> <com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
</com-issue-detail-card> </com-issue-detail-card>
<view class="split_line"></view> <view class="split_line"></view>
@ -107,7 +110,7 @@
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}); });
this.id = option.id; this.id = option.id;
this.scanMessage = option.scanMessage || ''; this.scanMessage = option.scanMessage || '';
@ -203,7 +206,7 @@
// //
if(this.scanMessage){ if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage); this.openScanPopupSimulate(this.scanMessage);
} }
@ -451,22 +454,23 @@
let s = ''; let s = '';
detail.Items.forEach(item => { detail.Items.forEach(item => {
let totalHandleQty = 0; let totalHandleQty = 0;
var isHandleEmpty =false;// handleQty =0; var isHandleEmpty = false; // handleQty =0;
item.Locations.forEach(lco => { item.Locations.forEach(lco => {
lco.Batchs.forEach(batch => { lco.Batchs.forEach(batch => {
if(batch.handleQty!=0){ if (batch.handleQty != 0) {
totalHandleQty = calc.add(totalHandleQty, batch.handleQty) totalHandleQty = calc.add(totalHandleQty, batch
}else { .handleQty)
isHandleEmpty=true; } else {
isHandleEmpty = true;
} }
}) })
}) })
if(item.qty == totalHandleQty){ if (item.qty == totalHandleQty) {
if(isHandleEmpty){ if (isHandleEmpty) {
return; return;
} }
this.submit(); this.submit();
}else { } else {
this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty + this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
'】与物料需求数量【' + item.qty + '】与物料需求数量【' + item.qty +
'】不一致,是否继续提交', res => { '】不一致,是否继续提交', res => {
@ -556,8 +560,8 @@
this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent); this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
}, },
openScanPopupSimulate(scanMessage){ openScanPopupSimulate(scanMessage) {
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,scanMessage); this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent, scanMessage);
}, },
closeScanPopup() { closeScanPopup() {

8
src/pages/issue/request/issueRequestDetail.vue

@ -1,17 +1,17 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<view class="header_job_top"> <view class="header_job_top">
<request-top :dataContent="requestContent"></request-top> <request-top :dataContent="requestContent"></request-top>
</view> </view>
<view class="header_item"> <view class="header_item">
<work-station :workshopCode="requestContent.workshopCode" <work-station :workshopCode="requestContent.workshopCode"
:productionLineCode="titleInfo.productionLineCode" :workStationCode="titleInfo.workStationCode" :productionLineCode="requestContent.productionLineCode" :workStationCode="requestContent.workStationCode"
:rawLocationCode="titleInfo.toLocationCode"></work-station> :rawLocationCode="titleInfo.toLocationCode"></work-station>
</view> </view>
</view> </view>
<view class='split_line'></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 class="detail-list"> <view class="detail-list">
@ -68,7 +68,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.getDetail(); this.getDetail();

4
src/pages/purchaseReceipt/job/receiptDetail.vue

@ -1,6 +1,7 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<view class="header_job_top"> <view class="header_job_top">
<jobTopAsn :dataContent="jobContent"></jobTopAsn> <jobTopAsn :dataContent="jobContent"></jobTopAsn>
</view> </view>
@ -18,14 +19,13 @@
<uni-section title="拒收原因" type="line"> <uni-section title="拒收原因" type="line">
<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput> <uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
</uni-section> </uni-section>
</view>
</view> </view>
<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode" <!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
:isShowEdit="false"></required-location> :isShowEdit="false"></required-location>
<view class='split_line'></view> --> <view class='split_line'></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" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">

19
src/pages/purchaseReturn/job/returnDetail.vue

@ -1,22 +1,22 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<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">
申请单号{{jobContent.requestNumber}} 申请单号{{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></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 class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData" :queryBalance="false" <com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
:queryBalance="false" @updateData='updateData' @openDetail="openDetail">
@updateData='updateData' @openDetail="openDetail">
</com-detail-card> </com-detail-card>
</view> </view>
</view> </view>
@ -35,7 +35,8 @@
</view> </view>
<win-scan-button @goScan='openScanPopup'></win-scan-button> <win-scan-button @goScan='openScanPopup'></win-scan-button>
<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' :queryBalance='false'></win-scan-pack-and-location> <win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult'
:queryBalance='false'></win-scan-pack-and-location>
<return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup> <return-detail-info-popup ref="jobDetailPopup"></return-detail-info-popup>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
</view> </view>
@ -99,7 +100,7 @@
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情', title: option.title + '详情',
}) })
this.id = option.id; this.id = option.id;
if (this.id != undefined) { if (this.id != undefined) {
@ -258,9 +259,9 @@
itemDetail.handleQty = Number(result.label.qty); itemDetail.handleQty = Number(result.label.qty);
itemDetail.toInventoryStatus = itemDetail.inventoryStatus; itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
itemDetail.balance={ itemDetail.balance = {
packQty:Number(result.package.packQty), packQty: Number(result.package.packQty),
uom:result.package.uom uom: result.package.uom
} }
// itemDetail.balance = result.balance; // itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = Number(result.balance.qty); // itemDetail.balance.balanceQty = Number(result.balance.qty);

5
src/pages/purchaseReturn/request/returnRequestDetail.vue

@ -1,13 +1,14 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<view class="header_job_top"> <view class="header_job_top">
<request-top :dataContent="requestContent"></request-top> <request-top :dataContent="requestContent"></request-top>
</view> </view>
<view class="header_item"> <view class="header_item">
供应商 : {{requestContent.supplierCode}} 供应商 : {{requestContent.supplierCode}}
</view> </view>
<view class='split_line'></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">
@ -61,7 +62,7 @@
onLoad(option) { onLoad(option) {
this.id = option.id; this.id = option.id;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.getDetail(); this.getDetail();
}, },

30
src/pages/putaway/job/putawayDetail.vue

@ -1,21 +1,22 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<veiw class="header-view">
<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">
申请单号 : {{jobContent.requestNumber}} 申请单号 : {{jobContent.requestNumber}}
</view> </view>
<view class='split_line'></view> </veiw>
</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 class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false" <comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
@remove="updateData" @updateData="updateData" :isShowStatus="false" @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'> :locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard> </comJobDetailCard>
</view> </view>
@ -41,7 +42,8 @@
<!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true"> <!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
</winScanPackAndLocationNoBalance> --> </winScanPackAndLocationNoBalance> -->
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true"> <winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
:noShowBalanceMessage="true">
</winScanPackAndLocation> </winScanPackAndLocation>
<comMessage ref="comMessage"></comMessage> <comMessage ref="comMessage"></comMessage>
@ -110,15 +112,15 @@
jobStatus: "", jobStatus: "",
jobToLocationCode: "", jobToLocationCode: "",
isCheckLocation: false, isCheckLocation: false,
scanMessage:"" scanMessage: ""
}; };
}, },
onLoad(option) { onLoad(option) {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: option.title+'详情' title: option.title + '详情'
}) })
this.id = option.id; this.id = option.id;
this.scanMessage =option.scanMessage this.scanMessage = option.scanMessage
if (this.id != undefined) { if (this.id != undefined) {
// //
if (option.status == "1") { if (option.status == "1") {
@ -203,7 +205,7 @@
that.toLocationCode = that.jobToLocationCode; that.toLocationCode = that.jobToLocationCode;
} }
// //
if(this.scanMessage){ if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage) this.openScanPopupSimulate(this.scanMessage)
} }
@ -251,7 +253,7 @@
calcTreeHandleQty(this.detailSource) calcTreeHandleQty(this.detailSource)
}, },
// //
openScanPopupSimulate(message){ openScanPopupSimulate(message) {
let fromlocationCode = ''; let fromlocationCode = '';
let fromlocationList = []; let fromlocationList = [];
@ -269,7 +271,8 @@
} }
}) })
} }
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,message); this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
message);
}, },
openScanPopup() { openScanPopup() {
@ -306,7 +309,7 @@
var itemCode = result.label.itemCode; var itemCode = result.label.itemCode;
var locationCode = result.fromLocationCode; var locationCode = result.fromLocationCode;
if(!result.balance){ if (!result.balance) {
this.showMessage("箱码【" + packingNumber + "】没有库存余额") this.showMessage("箱码【" + packingNumber + "】没有库存余额")
return; return;
} }
@ -345,7 +348,7 @@
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中") .fromLocationCode + "】不在列表中")
} else { } else {
if (!isExit.cancleScanedHiht&&isExit.scaned) { if (!isExit.cancleScanedHiht && isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描") this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else { } else {
isExit.scaned = true isExit.scaned = true
@ -373,7 +376,8 @@
// //
itemDetail.fromInventoryStatus = result.balance.inventoryStatus; itemDetail.fromInventoryStatus = result.balance.inventoryStatus;
if (!itemDetail.cancleScanedHiht&&itemDetail.scaned && scanedLength == itemDetail.packList.length) { if (!itemDetail.cancleScanedHiht && itemDetail.scaned && scanedLength == itemDetail.packList
.length) {
this.showMessage("箱码【" + packingNumber + "】已经扫描") this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else { } else {
itemDetail.scaned = true; itemDetail.scaned = true;

9
src/pages/putaway/request/putawayRequestDetail.vue

@ -1,21 +1,21 @@
<template> <template>
<view class="page-wraper"> <view class="page-wraper">
<view class="page-header"> <view class="page-header">
<view class="header-view">
<view class="header_job_top"> <view class="header_job_top">
<request-top :dataContent="requestContent"></request-top> <request-top :dataContent="requestContent"></request-top>
</view> </view>
<view class="header_item"> <view class="header_item">
供应商 : {{requestContent.supplierCode}} 供应商 : {{requestContent.supplierCode}}
</view> </view>
<view class='split_line'></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 class="detail-list" v-for="(item, index) in detailSource" :key="item.id"> <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
<view class=""> <view class="">
<comRequestDetailCard :dataContent="item" <comRequestDetailCard :dataContent="item" @openDetail="openDetail">
@openDetail="openDetail">
</comRequestDetailCard> </comRequestDetailCard>
</view> </view>
</view> </view>
@ -107,8 +107,7 @@
showMessage(message) { showMessage(message) {
this.$refs.comMessage.showMessage(message, res => { this.$refs.comMessage.showMessage(message, res => {
if (res) { if (res) {}
}
}); });
}, },

Loading…
Cancel
Save