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

增加样式

hella_online_20240829
niexiting 4 months ago
parent
bb06d9c95c
commit
e118fa142e
11 changed files with 205 additions and 182 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. 2
      src/common/style/new_style.css
  2. 12
      src/common/style/pdabasic.css
  3. 54
      src/mycomponents/workStation/workStation.vue
  4. 58
      src/pages/issue/coms/comIssueRequestCard.vue
  5. 56
      src/pages/issue/job/issueDetail.vue
  6. 22
      src/pages/issue/request/issueRequestDetail.vue
  7. 36
      src/pages/purchaseReceipt/job/receiptDetail.vue
  8. 37
      src/pages/purchaseReturn/job/returnDetail.vue
  9. 17
      src/pages/purchaseReturn/request/returnRequestDetail.vue
  10. 54
      src/pages/putaway/job/putawayDetail.vue
  11. 39
      src/pages/putaway/request/putawayRequestDetail.vue

2
src/common/style/new_style.css
View File

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

12
src/common/style/pdabasic.css
View File

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

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

@ -1,33 +1,31 @@
<template>
<view class="header_job_top">
<view class="cen_card">
<view class="cell_box uni-flex uni-row">
<view class="cell_info" v-if="fromWarehouseCode!=''">
<view class="text_lightblue">仓库</view>
<view>{{fromWarehouseCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{workshopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原材料库位</view>
<view>{{ rawLocationCode }}</view>
</view>
<view class="cen_card">
<view class="cell_box uni-flex uni-row">
<!-- <view class="cell_info" v-if="fromWarehouseCode!=''">
<view class="text_lightblue">仓库</view>
<view>{{fromWarehouseCode}}</view>
</view> -->
<view class="cell_info">
<view class="text_lightblue">车间</view>
<view>{{workshopCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">生产线</view>
<view>{{productionLineCode}}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">工位</view>
<view>{{ workStationCode }}</view>
</view>
<view class="cell_info">
<view class="text_lightblue">原料库位</view>
<view>{{ rawLocationCode }}</view>
</view>
<!-- <view class="cell_info">
<view class="text_lightblue">成品库位</view>
<view>{{ fgLocationCode }}</view>
</view> -->
</view>
</view>
</view>
</template>
@ -42,11 +40,11 @@
watch: {},
props: {
fromWarehouseCode:{
fromWarehouseCode: {
type: String,
default: ""
},
workshopCode: {
type: String,
default: ""
@ -74,4 +72,4 @@
</script>
<style>
</style>
</style>

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

@ -1,34 +1,42 @@
<template>
<request-com-main-card :dataContent="dataContent">
<jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
</request-com-main-card>
</template>
<request-com-main-card :dataContent="dataContent">
<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>
</template>
<script>
import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
<script>
import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
export default {
components: {
requestComMainCard,
export default {
components: {
requestComMainCard,
jobComMainDetailCard
},
data() {
return {};
},
},
data() {
return {};
},
props: {
dataContent: {
type: Object,
default: {}
},
},
props: {
dataContent: {
type: Object,
default: {}
},
},
methods: {
methods: {
}
}
</script>
}
}
</script>
<style lang="scss">
<style lang="scss">
</style>
</style>

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

@ -1,20 +1,23 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<work-station :workshopCode="jobContent.workShopCode"
:productionLineCode="jobContent.detailProductionLineCode" :workStationCode="jobContent.detailWorkStationCode"
:rawLocationCode="jobContent.detailToLocationCode">
</work-station>
</view>
<!-- <view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view> -->
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
<view v-for="(toLocation, index) in detailSource">
<work-station :workshopCode="jobContent.workShopCode"
<!-- <work-station :workshopCode="jobContent.workShopCode"
:productionLineCode="toLocation.productionLineCode"
:workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode">
</work-station>
</work-station> -->
<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
</com-issue-detail-card>
<view class="split_line"></view>
@ -107,7 +110,7 @@
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
});
this.id = option.id;
this.scanMessage = option.scanMessage || '';
@ -201,11 +204,11 @@
that.subList = res.data.subList;
that.detailSource = getDataSource(that.detailSource, that.subList)
//任务中已经扫描，模拟扫描赋值
if(this.scanMessage){
if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage);
}
setTimeout(r => {
that.resizeCollapse();
@ -280,7 +283,7 @@
itemCodes.push(item.itemCode)
})
})
//获取管理模式，封装参数
getManagementPrecisions(itemCodes, locationCode, res => {
if (res.success) {
@ -451,22 +454,23 @@
let s = '';
detail.Items.forEach(item => {
let totalHandleQty = 0;
var isHandleEmpty =false;//多个库位时 handleQty =0;
var isHandleEmpty = false; //多个库位时 handleQty =0;
item.Locations.forEach(lco => {
lco.Batchs.forEach(batch => {
if(batch.handleQty!=0){
totalHandleQty = calc.add(totalHandleQty, batch.handleQty)
}else {
isHandleEmpty=true;
if (batch.handleQty != 0) {
totalHandleQty = calc.add(totalHandleQty, batch
.handleQty)
} else {
isHandleEmpty = true;
}
})
})
if(item.qty == totalHandleQty){
if(isHandleEmpty){
if (item.qty == totalHandleQty) {
if (isHandleEmpty) {
return;
}
this.submit();
}else {
} else {
this.$refs.comMessage.showQuestionMessage('实际扫描数量【' + totalHandleQty +
'】与物料需求数量【' + item.qty +
'】不一致，是否继续提交', res => {
@ -475,8 +479,8 @@
}
});
}
// if (item.qty == totalHandleQty&&!isHandleEmpty) {
// //提交
// console.log("提交")
@ -555,11 +559,11 @@
// Object.assign(datacontent, this.detailSource);
this.$refs.comScanIssuePack.openScanPopup(this.detailSource, this.jobContent);
},
openScanPopupSimulate(scanMessage){
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent,scanMessage);
openScanPopupSimulate(scanMessage) {
this.$refs.comScanIssuePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent, scanMessage);
},
closeScanPopup() {
this.updateCommitBtn();
},

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

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

36
src/pages/purchaseReceipt/job/receiptDetail.vue
View File

@ -1,31 +1,31 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<jobTopAsn :dataContent="jobContent"></jobTopAsn>
</view>
<view v-if="operation=='receipt'" class="uni-flex uni-row "
style=";margin-top: 10rpx; margin-left: 10rpx; text-align: right;">
<view class="font_default" style="display: block; ">
整单收货
<view class="header-view">
<view class="header_job_top">
<jobTopAsn :dataContent="jobContent"></jobTopAsn>
</view>
<view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
<u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
@change="switchChange"></u-switch>
<view v-if="operation=='receipt'" class="uni-flex uni-row "
style=";margin-top: 10rpx; margin-left: 10rpx; text-align: right;">
<view class="font_default" style="display: block; ">
整单收货
</view>
<view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
<u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
@change="switchChange"></u-switch>
</view>
</view>
<view class="" v-if="operation=='reject'">
<uni-section title="拒收原因" type="line">
<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
</uni-section>
</view>
</view>
<view class="" v-if="operation=='reject'">
<uni-section title="拒收原因" type="line">
<uni-easyinput v-model="reasonText" placeholder="请输入拒收原因"></uni-easyinput>
</uni-section>
</view>
<!-- <required-location ref="locationCompare" title="默认收货库位 :" :locationCode="jobToLocationCode"
:isShowEdit="false"></required-location>
<view class='split_line'></view> -->
</view>
<view class="split_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">
@ -331,7 +331,7 @@
itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
this.$forceUpdate()
}
} else {
//扫描的是外包装,将包装集合全部扫描
var scanedLength = 0;

37
src/pages/purchaseReturn/job/returnDetail.vue
View File

@ -1,22 +1,22 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号：{{jobContent.requestNumber}}
<view class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号：{{jobContent.requestNumber}}
</view>
</view>
<view class='split_line'></view>
</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" :queryBalance="false"
@updateData='updateData' @openDetail="openDetail">
<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
:queryBalance="false" @updateData='updateData' @openDetail="openDetail">
</com-detail-card>
</view>
</view>
@ -35,7 +35,8 @@
</view>
<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>
<comMessage ref="comMessage"></comMessage>
</view>
@ -99,7 +100,7 @@
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情',
title: option.title + '详情',
})
this.id = option.id;
if (this.id != undefined) {
@ -256,11 +257,11 @@
} else {
itemDetail.scaned = true;
itemDetail.handleQty = Number(result.label.qty);
itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
itemDetail.balance={
packQty:Number(result.package.packQty),
uom:result.package.uom
itemDetail.balance = {
packQty: Number(result.package.packQty),
uom: result.package.uom
}
// itemDetail.balance = result.balance;
// itemDetail.balance.balanceQty = Number(result.balance.qty);
@ -276,8 +277,8 @@
// itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
}
// if (itemDetail == undefined) {
// itemDetail = detail.subList.find(r => {
// return r.packingNumber == packingNumber &&
@ -491,4 +492,4 @@
<style scoped lang="scss">
</style>
</style>

17
src/pages/purchaseReturn/request/returnRequestDetail.vue
View File

@ -1,13 +1,14 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
</view>
</view>
<view class='split_line'></view>
</view>
<view class="page-main">
<scroll-view scroll-y="true" class="page-main-scroll">
@ -61,7 +62,7 @@
onLoad(option) {
this.id = option.id;
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.getDetail();
},
@ -128,4 +129,4 @@
<style scoped lang="scss">
</style>
</style>

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

@ -1,21 +1,22 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
<view class='split_line'></view>
<veiw class="header-view">
<view class="header_job_top">
<job-top :dataContent="jobContent"></job-top>
</view>
<view class="header_item">
申请单号 : {{jobContent.requestNumber}}
</view>
</veiw>
</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="">
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
@remove="updateData" @updateData="updateData"
<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
:isShowStatus="false" @remove="updateData" @updateData="updateData"
:locationAreaTypeList='toLocationAreaTypeList'>
</comJobDetailCard>
</view>
@ -41,7 +42,8 @@
<!-- <winScanPackAndLocationNoBalance ref="scanPopup" @getResult='getScanResult' :allowNullBalance="true">
</winScanPackAndLocationNoBalance> -->
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult' :noShowBalanceMessage="true">
<winScanPackAndLocation :balanceFromInventoryStatuses="false" ref="scanPopup" @getResult='getScanResult'
:noShowBalanceMessage="true">
</winScanPackAndLocation>
<comMessage ref="comMessage"></comMessage>
@ -52,7 +54,7 @@
import {
getManagementPrecisions,
} from '@/common/balance.js';
import {
getPutawayJobDetail,
putawayJobSubmit,
@ -110,15 +112,15 @@
jobStatus: "",
jobToLocationCode: "",
isCheckLocation: false,
scanMessage:""
scanMessage: ""
};
},
onLoad(option) {
uni.setNavigationBarTitle({
title: option.title+'详情'
title: option.title + '详情'
})
this.id = option.id;
this.scanMessage =option.scanMessage
this.scanMessage = option.scanMessage
if (this.id != undefined) {
//新建的任务自动接收
if (option.status == "1") {
@ -129,7 +131,7 @@
this.getDetail();
}
}
},
//返回首页
@ -203,7 +205,7 @@
that.toLocationCode = that.jobToLocationCode;
}
//外部进入详情，如果有扫描信息，模拟自动扫描
if(this.scanMessage){
if (this.scanMessage) {
this.openScanPopupSimulate(this.scanMessage)
}
@ -251,8 +253,8 @@
calcTreeHandleQty(this.detailSource)
},
//模拟扫描功能
openScanPopupSimulate(message){
openScanPopupSimulate(message) {
let fromlocationCode = '';
let fromlocationList = [];
for (var i = 0; i < this.detailSource.length; i++) {
@ -269,7 +271,8 @@
}
})
}
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,message);
this.$refs.scanPopup.openScanPopupForJobSimulate(fromlocationCode, fromlocationList, this.jobContent,
message);
},
openScanPopup() {
@ -305,8 +308,8 @@
var qty = result.label.qty;
var itemCode = result.label.itemCode;
var locationCode = result.fromLocationCode;
if(!result.balance){
if (!result.balance) {
this.showMessage("箱码【" + packingNumber + "】没有库存余额")
return;
}
@ -345,7 +348,7 @@
this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
.fromLocationCode + "】不在列表中")
} else {
if (!isExit.cancleScanedHiht&&isExit.scaned) {
if (!isExit.cancleScanedHiht && isExit.scaned) {
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
isExit.scaned = true
@ -369,11 +372,12 @@
scanedLength++;
}
})
//大哥让加的
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 + "】已经扫描")
} else {
itemDetail.scaned = true;

39
src/pages/putaway/request/putawayRequestDetail.vue
View File

@ -1,21 +1,21 @@
<template>
<view class="page-wraper">
<view class="page-header">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
<view class="header-view">
<view class="header_job_top">
<request-top :dataContent="requestContent"></request-top>
</view>
<view class="header_item">
供应商 : {{requestContent.supplierCode}}
</view>
</view>
<view class='split_line'></view>
</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="">
<comRequestDetailCard :dataContent="item"
@openDetail="openDetail">
<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
</comRequestDetailCard>
</view>
</view>
@ -44,7 +44,7 @@
import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
import requestDetailInfoPopup from '@/pages/putaway/coms/requestDetailInfoPopup.vue'
import requestTop from "@/mycomponents/request/requestTop.vue"
export default {
components: {
comRequestDetailCard,
@ -91,24 +91,23 @@
if (res.data == null) {
that.showMessage('未获取到详情');
} else {
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
if (res.data.subList.length > 0) {
that.requestContent = res.data;
that.subList = res.data.subList;
that.detailSource = getDataSource(that.subList);
} else {
that.showMessage('列表数据为0');
}
}
}).catch(error => {
uni.hideLoading()
this.showMessage(error)
})
},
showMessage(message) {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
}
if (res) {}
});
},
@ -123,4 +122,4 @@
<style scoped lang="scss">
</style>
</style>
Write Preview
Loading…
Cancel
Save