新增 退扫功能

master
hou 4 years ago
parent 835292800c
commit c21b64da1c

@ -53,6 +53,7 @@ export default {
rawMenu_ReturnGoods: '退货',
rawMenu_SignOut: '退出',
Purchase: '采购单',
BackSweep: '退扫',
//po收货
po_ReceivingGoods: 'PO收货',
@ -91,6 +92,8 @@ export default {
//dn收货
dn_ReceivingGoods: 'DN收货',
dn_OddNumbers: 'DN单号',
QuantityReturned: '已退数量',
SweptQuantity: '已扫数量',
dn_PleaseScan: '请扫描DN单号',
barcode_PleaseScan: '请扫描条码',
dn_CarNumber: '车牌号',
@ -323,6 +326,7 @@ export default {
product_Location: '库位',
LocationScanned: '库位已扫',
product_barCode: '条码',
sweepBarCode: '成品条码',
barcode: '请输入条码',
product_TransferCar: '周转车',
product_MaterialCode: '物料条码',

@ -275,6 +275,8 @@ export default {
//移库
Warehouse_QueryCriteria: 'Query criteria',
Warehouse_TransferOrderNo: 'Transfer order No',
BackSweep: 'Back sweep',
SweptQuantity: 'Swept quantity',
LocationInventory: 'Location inventory',
Warehouse_TransferDetails: 'Transfer detail',
Warehouse_OrderNo: 'Order No',
@ -333,6 +335,8 @@ export default {
//成品下线
product_Location: 'Loc',
product_barCode: 'Barcode',
sweepBarCode: 'Barcode',
QuantityReturned: 'Quantity returned',
product_TransferCar: 'Transfer vehicle',
product_MaterialCode: 'MAT code',
product_FGCode: 'FG code',

@ -41,6 +41,14 @@
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/product/outbound/stoOutbound/Back",
"style": {
"navigationBarTitleText": "退扫",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/product/outbound/index",
"style": {

@ -0,0 +1,118 @@
<template>
<view class="page-raw-returning">
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({ delta: 1 })" />
</view>
<view class="title">{{ $t('message.BackSweep') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :error-type="['toast']" label-width="150rpx">
<!-- DN单号 -->
<u-form-item :label="$t('message.dn_OddNumbers')">
<u-input v-model="SweepCode" :disabled="true" />
</u-form-item>
<!-- 已扫数量 -->
<u-form-item :label="$t('message.SweptQuantity')">
<u-input v-model="model.orderInInfo.stoAmount" :disabled="true" />
</u-form-item>
<!-- 已退数量 -->
<u-form-item :label="$t('message.QuantityReturned')">
<u-input v-model="model.orderInInfo.stoAmount" :disabled="true" />
</u-form-item>
<!-- 成品条码 -->
<u-form-item :label="$t('message.sweepBarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="arr" @search="BackSweep" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="6">
<u-button type="warning" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
</u-col>
<u-col :span="6">
<u-button type="primary" @click="BackSweep">{{ $t('message.BackSweep') }}</u-button>
</u-col>
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import { session } from '@/store/modules/session';
@Component
export default class stoOutboundDom extends BasePage {
model = model;
SweepCode: any = '';
firstFocus = false;
arr: any = '';
onReady() {
let code = sessionStorage.getItem('SweepCode');
this.SweepCode = JSON.parse(code);
}
BackSweep() {}
}
</script>
<style lang="scss" scoped>
.page-raw-returning {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
height: 88rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
.form {
background-color: #fff;
padding: 40rpx;
border-radius: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.u-form-item {
padding: 30rpx 0;
line-height: 35rpx;
}
}
.bottom-bar {
position: fixed;
bottom: 0;
left: 0;
right: 0;
z-index: 99;
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
}
</style>

@ -55,14 +55,17 @@
<view class="bottom-bar">
<u-row class="button-bar">
<!-- Guoshuang 详细跳转要改调接口 -->
<u-col :span="6">
<u-col :span="4">
<u-button type="warning" @click="detailed">{{ $t('message.detailed') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="BackSweep">{{ $t('message.BackSweep') }}</u-button>
</u-col>
<!-- <u-col :span="4">
<u-button type="error" @click="resetHandle">{{ $t('message.product_Empty') }}</u-button>
</u-col> -->
<!-- Guoshuang 出库要改入参 -->
<u-col :span="6">
<u-col :span="4">
<u-button type="primary" @click="onOk">{{ $t('message.po_Deliver') }}</u-button>
</u-col>
<!-- <u-col :span="3">-->
@ -172,6 +175,17 @@ export default class stoOutboundDom extends BasePage {
await this.model.queryDetailed(this.form.orderNo);
this.toPage(this.page.product.outbound.stoOutboundDetail);
}
BackSweep() {
if (!this.form.orderNo) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips1') as any,
});
return;
}
sessionStorage.setItem('SweepCode', JSON.stringify(this.form.orderNo));
this.toPage(this.page.product.outbound.Back);
}
async query() {
if (!this.form.orderNo) {
uni.showToast({

@ -186,7 +186,7 @@ export class ReturningModule extends VuexModule {
});
console.log('res数据', data, code);
const materielList = data;
console.log(">>>>>>>",materielList);
console.log('>>>>>>>', materielList);
return { code, materielList };
}
}

@ -30,6 +30,7 @@ export const page = {
foreign: '/pages/product/outbound/foreign/index',
stoOutbound: '/pages/product/outbound/stoOutbound/index',
delivergoods: '/pages/product/outbound/stoOutbound/DN-delivergoods',
Back: '/pages/product/outbound/stoOutbound/Back',
stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail',
},
warehouse: {

Loading…
Cancel
Save