Commit 92769af3 authored by xiangzj's avatar xiangzj

采购入库

parent f75194fa
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
import StickyNavBar from '@/components/StickyNavBar/index.vue'; import StickyNavBar from '@/components/StickyNavBar/index.vue';
import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue'; import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
import BottomBtn from '@/components/BottomBtn/index.vue'; import BottomBtn from '@/components/BottomBtn/index.vue';
import { parseTime} from "@/utils/ruoyi";
export default { export default {
components: { components: {
StickyNavBar, StickyNavBar,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<view class="items">WC01:{{goodsList[0]&&goodsList[0].workstationName}}</view> <view class="items">WC01:{{goodsList[0]&&goodsList[0].workstationName}}</view>
<view class="items">计划日期:{{goodsList[0]&&goodsList[0].startTime}}</view> <view class="items">计划日期:{{goodsList[0]&&goodsList[0].startTime}}</view>
</view> </view>
<view class=""> <view class="checkedCase">
<checkbox-group @change="checkedChange"> <checkbox-group @change="checkedChange">
<checkbox value="r1" :checked="checkedBox" />是否结案 <checkbox value="r1" :checked="checkedBox" />是否结案
</checkbox-group> </checkbox-group>
...@@ -113,8 +113,6 @@ export default { ...@@ -113,8 +113,6 @@ export default {
}, },
created() { created() {
// this.handleInputNlpla() // this.handleInputNlpla()
// this.getPlnr('100021240419000001|00010001020000050.000|10002441900001');
// this.getPlnr('100021240419000001|00010001020000060.000|10002441900002');
}, },
methods: { methods: {
getOrder(applyNo) { getOrder(applyNo) {
...@@ -206,6 +204,7 @@ export default { ...@@ -206,6 +204,7 @@ export default {
console.log(res); console.log(res);
if (res.every((item) => item.TYPE === 'S')) { if (res.every((item) => item.TYPE === 'S')) {
this.goodsList = []; this.goodsList = [];
this.list = [];
this.nlpla = ''; this.nlpla = '';
this.wxparams = ''; this.wxparams = '';
this.$u.toast('提交成功'); this.$u.toast('提交成功');
...@@ -452,4 +451,7 @@ page { ...@@ -452,4 +451,7 @@ page {
top: 0 !important; top: 0 !important;
background: #fff; background: #fff;
} }
.checkedCase{
margin-top: 10rpx;
}
</style> </style>
\ No newline at end of file
...@@ -127,15 +127,6 @@ page { ...@@ -127,15 +127,6 @@ page {
margin: 0px 10rpx; margin: 0px 10rpx;
} }
} }
.cardbox {
min-height: calc(100vh - 540rpx);
padding: 0rpx 20rpx;
margin-top: 20rpx;
}
.cardContent {
border-radius: 8px;
background: #fff;
}
.listItemTitle { .listItemTitle {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
......
...@@ -27,41 +27,6 @@ ...@@ -27,41 +27,6 @@
<ContentLoadingMore class="cardbox" :list='chargaArr'> <ContentLoadingMore class="cardbox" :list='chargaArr'>
<view class="cardContent" v-for="(item, index) in chargaArr"> <view class="cardContent" v-for="(item, index) in chargaArr">
<listItem :item="item" :goodsList="goodsList" :nlpla="nlpla" @deleGonds="deleGonds"/> <listItem :item="item" :goodsList="goodsList" :nlpla="nlpla" @deleGonds="deleGonds"/>
<!-- <view class="listItemTitle">
<view>
<view class="item">入库批次:{{ item.CHARG }}</view>
<view class="item">物料编号:{{ item.MATNR }}</view>
<view class="item">物料描述:{{ item.MAKTX }}</view>
<view class="item">入库数量:{{ item.ERFMG }}</view>
<view class="item">入库库位:{{ nlpla }}</view>
</view>
<u-button size="mini" type="primary" plain @click="deleGonds(index)">
<u-icon name="trash" size="28"></u-icon>
删除
</u-button>
</view>
<view class="listBottom">
<view class="bottomTitle" @tap="show = !show">
<view class="desc">卷条码明细</view>
<view class="topIcons">
<view v-if="show">
<u-icon name="arrow-down" color="#aaa" size="32"></u-icon>
展开
</view>
<view v-else>
<u-icon name="arrow-up" color="#aaa" size="32"></u-icon>
收起
</view>
</view>
</view>
<view v-if="!show" class="bottomBox">
<view class="bottomItem">
<view class="items plNum">{{ item.PLNR }}</view>
<view class="items">数量:{{ item.TOMNG }}</view>
<view class="items">生产日期:{{ item.BLDAT }}</view>
</view>
</view>
</view> -->
</view> </view>
</ContentLoadingMore> </ContentLoadingMore>
<BottomBtn :btnArr="btnArr" @getBtnHandle="getBtnHandle"></BottomBtn> <BottomBtn :btnArr="btnArr" @getBtnHandle="getBtnHandle"></BottomBtn>
...@@ -73,6 +38,7 @@ import listItem from "./listItem.vue" ...@@ -73,6 +38,7 @@ import listItem from "./listItem.vue"
import StickyNavBar from '@/components/StickyNavBar/index.vue'; import StickyNavBar from '@/components/StickyNavBar/index.vue';
import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue'; import ContentLoadingMore from '@/components/ContentLoadingMore/index.vue';
import BottomBtn from '@/components/BottomBtn/index.vue'; import BottomBtn from '@/components/BottomBtn/index.vue';
import { parseTime} from "@/utils/ruoyi";
export default { export default {
components: { components: {
StickyNavBar, StickyNavBar,
...@@ -108,7 +74,8 @@ export default { ...@@ -108,7 +74,8 @@ export default {
}; };
}, },
created() { created() {
// this.getPlnr('10000820240325000001|10000320100'); // this.getPlnr('100001240428000002|00100000000000014.000|10002442800002');
// this.getPlnr('100001240428000002|00100000000000019.500|10002442800001');
}, },
methods: { methods: {
deleGonds(detail) { deleGonds(detail) {
...@@ -141,8 +108,8 @@ export default { ...@@ -141,8 +108,8 @@ export default {
this.$u.api.sapApi this.$u.api.sapApi
.sapRrm([ .sapRrm([
{ {
BLDAT: '20240325', BLDAT: parseTime(new Date(),'{y}{m}{d}'),
BUDAT: '20240325', BUDAT: parseTime(new Date(),'{y}{m}{d}'),
ZENCODE: 'A014', ZENCODE: 'A014',
TYPE: 'CG', TYPE: 'CG',
ITEM: data ITEM: data
...@@ -187,6 +154,15 @@ export default { ...@@ -187,6 +154,15 @@ export default {
}) })
.then((res) => { .then((res) => {
if (res && res.RESULT.TYPE === 'S') { if (res && res.RESULT.TYPE === 'S') {
if (this.goodsList.some((item) => item.PLNR === plnr)) {
setTimeout(() => {
this.isFocus = true;
this.isDisabled = false;
this.wxparams = '';
}, 1000);
this.$u.toast('已经存在当前条码');
return
}
this.goodsList = this.goodsList.concat(res.DATA); this.goodsList = this.goodsList.concat(res.DATA);
this.totalNum = 0; this.totalNum = 0;
this.goodsList.forEach((ele) => { this.goodsList.forEach((ele) => {
...@@ -273,62 +249,7 @@ page { ...@@ -273,62 +249,7 @@ page {
.cardContent { .cardContent {
border-radius: 8px; border-radius: 8px;
background: #fff; background: #fff;
margin-bottom: 10rpx;
}
.listItemTitle {
display: flex;
justify-content: space-between;
padding: 20rpx;
border-bottom: 2px solid #f8f8f8;
.u-btn {
width: 150rpx;
margin: 0px;
margin-top: 10rpx;
}
.item {
line-height: 50rpx;
color: #000;
font-size: 28rpx;
font-weight: 500;
word-break: break-all;
}
}
.listBottom {
.bottomTitle {
height: 80rpx;
position: relative;
.desc {
color: #bbb;
font-size: 24rpx;
line-height: 80rpx;
padding-left: 20rpx;
}
.topIcons {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
color: #aaa;
}
}
.bottomBox {
padding: 20rpx;
.bottomItem {
background: #f8f8f8;
padding: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
.items {
color: #333;
font-size: 24rpx;
height: 40rpx;
line-height: 40rpx;
}
.plNum{
height: 80rpx;
word-break: break-all;
}
}
}
} }
/deep/ .u-sticky { /deep/ .u-sticky {
top: 0 !important; top: 0 !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment