委外入库和出库页面

master
zhoulei 4 years ago
parent bf3401be34
commit 3c4d1b09e3

@ -201,7 +201,20 @@ export default {
InventoryTotalNumber:'盘点总数',
InventoryPleaseScan: "请扫描单号",
// 委外-入库
CommissionEntrant:'委外入库',
CommissionedSingleNumber:'单号',
CommissionedMaterielNo:'物料号',
CommissionedMaterielDesc:'物料描述',
CommissionedDemandData:'需求数据',
CommissionedCumulativeData:'累计数据',
CommissionedLocation:'库位',
CommissionedThisNumber:'本次数量',
CommissionedEntrantDetails:'入库明细',
// 委外-出库
CommissionGoOut:'委外出库',
CommissionedGoOutDetails:'出库明细',
//移库
Warehouse_QueryCriteria: "查询条件",
Warehouse_TransferOrderNo: "移库单号",

@ -205,6 +205,21 @@ export default {
InventoryTotalNumber:'Total',
InventoryPleaseScan: "Please scan No.",
// 委外-入库
CommissionEntrant:'委外入库',
CommissionedSingleNumber:'单号',
CommissionedMaterielNo:'物料号',
CommissionedMaterielDesc:'物料描述',
CommissionedDemandData:'需求数据',
CommissionedCumulativeData:'累计数据',
CommissionedLocation:'库位',
CommissionedThisNumber:'本次数量',
CommissionedEntrantDetails:'入库明细',
// 委外-出库
CommissionGoOut:'委外出库',
CommissionedGoOutDetails:'出库明细',
//移库
Warehouse_QueryCriteria: "Query criteria",
Warehouse_TransferOrderNo: "Transfer order No",

@ -601,6 +601,47 @@
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/commission/index",
"style": {
"navigationBarTitleText": "委外",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/commission/entrant/index",
"style": {
"navigationBarTitleText": "委外入库",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/commission/entrant/detail",
"style": {
"navigationBarTitleText": "入库明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/commission/goOut/index",
"style": {
"navigationBarTitleText": "委外出库",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/commission/goOut/detail",
"style": {
"navigationBarTitleText": "出库明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/demo/index",
"style": {

@ -0,0 +1,21 @@
/**
*
*/
import vm from '@/main';
export const headers = [
{
label: vm.$t('message.product_barCode'),
key: 'barcode',
width: 300,
},
{
label: vm.$t('message.product_FGCode'),
key: 'materialCode',
width: 300,
},
{
label: vm.$t('message.product_FGDes'),
key: 'materialDesc',
width: 300,
},
];

@ -0,0 +1,182 @@
<template>
<view class="page-receipt-detail">
<view class="header">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view>
<view class="title">{{ $t('message.CommissionedEntrantDetails') }}</view>
<view class="right"></view>
</view>
<view class="table-wrapper">
<wyb-table
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="model.materielList"
:show-vert-border="false"
></wyb-table>
</view>
<view class="bottom-bar">
<div class="extra">
<u-row class="bottom-info">
<u-col :span="12"
>{{ $t('message.po_Total') }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col
>
<!-- <u-col :span="2">数量</u-col>-->
<!-- <u-col :span="4"><u-input v-model="locationCode"></u-input></u-col>-->
<!-- <u-col :span="3">-->
<!-- <u-button-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- :loading="$wait.is('*changeOrderInLocation')"-->
<!-- @click="changeLocation"-->
<!-- >-->
<!-- 拒收-->
<!-- </u-button>-->
<!-- </u-col>-->
</u-row>
</div>
<!-- <div class="container">-->
<!-- <u-row>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="primary" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">-->
<!-- {{-->
<!-- model.isCheckedAll-->
<!-- ? this.$t('message.po_noSelectAll')-->
<!-- : this.$t('message.po_SelectAll')-->
<!-- }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">-->
<!-- {{ $t('message.po_Submit') }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>-->
<!-- </u-col>-->
<!-- </u-row>-->
<!-- </div>-->
</view>
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import { headers } from './config';
@Component
export default class RawReceiptDetail extends BasePage {
/**
* 页面Module
*/
model = model;
/**
* 库位
*/
locationCode = '';
/**
* 表头
*/
headers = headers;
/**
* 逐条修改
*/
// changeLocation() {
// if (!this.model.hasChecked) {
// uni.showToast({
// icon: 'none',
// title: '',
// });
// return;
// }
// this.model.changeOrderInLocation(this.locationCode);
// }
/**
* 提交
*/
// async onSubmit() {
// await this.model.submitOrderInEnter();
// this.locationCode = '';
// }
}
</script>
<style lang="scss" scoped>
.page-receipt-detail {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 30rpx;
min-height: 100%;
padding-top: 118rpx;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
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;
}
}
.table-wrapper {
background-color: #fff;
}
.form {
background-color: #fff;
padding: 40rpx;
border-radius: 10rpx;
}
.bottom-bar {
z-index: 21;
position: fixed;
bottom: 0;
left: 0;
right: 0;
.container {
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
.extra {
background-color: #fff;
margin: 5px;
border-radius: 5px;
padding: 0 10px;
}
}
}
</style>

@ -0,0 +1,447 @@
<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="back" />
</view>
<view class="title">{{ $t('message.CommissionEntrant') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
<u-form-item :required="true" :label="this.$t('message.CommissionedSingleNumber')" prop="orderNo">
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.orderNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>
</u-form-item>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :required="true" :label="this.$t('message.CommissionedMaterielNo')">
<u-input
v-model="form.orderNo"
type="select"
@click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-select
:confirm-text="this.$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')"
v-model="materialCodeSelect"
:list="model.materielList"
@confirm="materialConfirm"
></u-select>
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedMaterielDesc')">
<u-input v-model="form.productCode" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedDemandData')">
<u-input v-model="form.productDescZh" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedCumulativeData')">
<u-input v-model="form.scanAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :required="true" :label="this.$t('message.CommissionedLocation')">
<u-input
v-model="form.qty"
type="select"
@click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-select
:confirm-text="this.$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')"
v-model="materialCodeSelect"
:list="model.materielList"
@confirm="materialConfirm"
></u-select>
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedThisNumber')">
<u-input v-model="form.scanAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col :span="8"></u-col>
<u-col :span="4">
<u-button :style="{margin:'24rpx 0'}" type="primary" size="medium" class="confirm" @click="confirm">{{$t('message.product_add')}}</u-button>
</u-col>
</u-row>
<u-col :span="12">
<view class="table-wrapper">
<u-table class="library-table">
<u-tr class="u-tr">
<u-th class="u-th">{{ $t("message.po_MaterielNo") }}</u-th>
<u-th class="u-th">{{ $t("message.po_MaterielDes") }}</u-th>
<u-th class="u-th">{{ $t("message.operation") }}</u-th>
</u-tr>
<u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
<u-td class="u-td">{{ item.productCode }}</u-td>
<u-td class="u-td">{{ item.productDescZh }}</u-td>
<u-td class="u-td">
<div class="u-td" @click="deleteItem(index)">
{{ $t("message.product_Delete") }}
</div>
</u-td>
</u-tr>
</u-table>
<!-- <wyb-table
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="materialList"
:show-vert-border="false"
@onCheck="onCheck"
></wyb-table> -->
</view>
</u-col>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="primary" @click="toPage(page.raw.commission.entrant.detail)">
{{
$t('message.CommissionedEntrantDetails')
}}
</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="resetHandle">{{ $t('message.product_Upload') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="error" @click="onOk">{{ $t('message.po_Return') }}</u-button>
</u-col>
<!-- <u-col :span="3">-->
<!-- <u-button type="success" @click="uni.navigateBack()"></u-button>-->
<!-- </u-col>-->
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
import { session } from '@/store/modules/session';
import { headers } from './config';
@Component
export default class stoOutboundDom extends BasePage {
/**
* 表单引用
*/
@Ref('form') readonly $form!: VForm;
/**
* 表格引用
*/
@Ref('table') readonly $table: any;
LocationList: any = [];
/**
* 页面Module
*/
model = model;
/**
* search焦点获取
*/
firstFocus = false;
/**
* 表头
*/
headers = headers;
/**
* 表单数据
*/
form = {
dockCode: null, // code
dockName: null, // name
orderNo: null,
qty: 0,
orderAmount: '',
productCode: 'test', // name
productDescZh: 'test',
scanAmount: '',
barCode: '',
};
materialList: any = []; //
//
selectMaterielList: any = [];
/**
* 工位退料人名称
*/
operatorName = '';
/**
* 退料类型选择
*/
returningTypeSelect = false;
//
materialCodeSelect = false;
/**
* 表单验证规则
*/
rules: VFormRules<any> = {
orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }],
};
confirm() {
// if (this.wlCode == "" || this.number == "") {
// uni.showToast({
// icon: "none",
// title: "",
// });
// return;
// }
this.LocationList.push(this.form)
}
deleteItem(index: any) {
this.LocationList.splice(index, 1);
}
// onReadyonLoad
async onReady() {
this.$form.setRules(this.rules);
model.queryReturningTypeList();
}
onCheck(e: any) {
console.log('e.data', e.data);
this.selectMaterielList = [];
e.data.forEach((line: any) => {
const { lineData: item } = line;
this.selectMaterielList.push(item);
});
}
back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 });
this.$table.onEmpty();
}
materialConfirm(v: any) {
console.log('v[0].value', v[0]);
// this.form.productCode = v[0].value;
this.model.materielList.forEach((item: any) => {
if (v[0].value == item.stoItem) {
this.form.productCode = item.materialCode;
this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount;
this.form.scanAmount = item.scanAmount;
}
});
console.log('this.form', this.form);
}
/**
* 清空
*/
resetHandle() {
this.materialList = [];
this.$table.onCheckAllTap();
this.model.materielList.forEach((item: any) => {
if (this.form.productCode == item.label) {
this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount;
this.form.scanAmount = item.scanAmount;
}
});
}
/**
* 条码回车
*/
onSubmit() {
this.$form.validate(async (valid: boolean) => {
if (this.form.productCode.slice(0, 9) != this.form.barCode.slice(0, 9)) {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip5') as string });
return;
}
if (parseInt(this.form.orderAmount) <= parseInt(this.form.scanAmount)) {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip6') as string });
return;
}
let list = [
{
order3: this.form.orderNo,
productCode: this.form.productCode,
productDescZh: this.form.productDescZh,
barCode: this.form.barCode,
dockCode: this.form.dockCode,
dockName: this.form.dockName,
orderType: 3,
type: 0,
keepBy: session.loginName as string,
loginName: session.loginName as string,
},
];
if (valid) {
const res = await this.model.tluSubmit(list);
console.log('fanhui ', res);
// if (res.barcode) {
// // this.materialList.push(res);
// this.form.scanAmount = res.scanAmount;
// }
if (this.materialList.length == 0) {
await this.materialList.push(res);
this.form.scanAmount += 1;
this.$table.onCheckAllTap();
} else {
let flag = 0;
for (let i = 0; i < this.materialList.length; i++) {
console.log('11111', this.materialList[i]);
if (this.form.barCode == this.materialList[i].barcode) {
flag = 1;
break;
}
}
if (flag == 0) {
await this.$table.onCheckAllTap();
await this.materialList.push(res);
this.form.scanAmount += 1;
this.$table.onCheckAllTap();
} else {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip7') as string });
}
}
}
});
const item = {
...this.form,
barCode: String(''),
};
this.firstFocus = false;
setTimeout(() => {
this.form = item;
this.firstFocus = true;
}, 0);
}
onOk() {
// if (this.selectMaterielList.length == 0) {
// uni.showToast({ icon: 'none', title: this.$t('message.product_Tip2') as string });
// } else {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
let selctlist: any = [];
this.selectMaterielList.forEach((item: any, index: any) => {
// item.originWl = item.locCode;
selctlist[index] = {
barCode: item.barcode,
keepBy: session.loginName,
loginName: session.loginName,
order3: this.form.orderNo,
orderType: 3,
type: 0,
productCode: item.productCode,
productDescZh: item.productDescZh,
originWl: item.locCode,
dockCode: item.dockCode,
dockName: item.dockName,
whCode: item.whCode,
regionCode: item.regionCode,
};
});
await this.model.confirm(selctlist);
// this.$form.resetFields();
// // this.form.barCode = '';
// this.selectMaterielList = [];
console.log('aaaaaaa', this.model);
if (this.model.code == '1') {
this.materialList = [];
// this.model.materielList = [];
this.$table.onCheckAllTap();
uni.showToast({ icon: 'success', title: 'success' });
}
});
this.form.barCode = '';
this.form.productCode = '';
// this.form.orderNo = null;
this.form.scanAmount = '';
this.form.orderAmount = '';
this.form.productDescZh = '';
this.selectMaterielList = [];
this.$table.onEmpty();
}
// }
}
</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;
}
.button-bar {
}
}
</style>

@ -0,0 +1,122 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { session } from '@/store/modules/session';
// import vm from '@/main';
class OrderInInfo {
stoAmount?: 0;
stoNo?: string; //STO采购单号
orderAmount?: string; //单据总数
Allocated?: string; //已分配
Unallocated?: string; //未分配
}
@Module({
namespaced: true,
dynamic: true,
store,
name: 'product.outbound.stoOutbound',
})
export class ReturningModule extends VuexModule {
/**
*
*/
returningTypeList: any[] = [];
/**
*
*/
materielList: any[] = [];
//条码扫描的返回的结果
oneMaterielDetail: any = {};
/**
*
*/
orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码
code = '';
/**
*
*/
@MutationAction
async queryReturningTypeList() {
const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, {
factoryCode: session.factoryCode,
whCode: session.warehouseCode,
loginName: session.loginName,
});
const returningTypeList = list.map((item: any) => ({
label: item.dockName,
value: item.dockCode,
}));
return { returningTypeList };
}
/**
*
* @param orderNo
*/
@MutationAction
async queryOrderInInfo(stoNo: string) {
const result = await http.post(url.outbound.stoOutbound.info, {
stoNo,
deleteFlag: 2,
finalState: 3,
loginName: session.loginName,
});
let stoAmount = 0;
result.data.records.forEach((item: any) => {
stoAmount += item.orderAmount;
});
const materielList = result.data.records.map((item: any) => ({
label: item.materialCode,
value: item.stoItem,
...item,
}));
console.log('materielList', materielList);
if (result.data.records[0]) {
result.data.records[0].stoAmount = stoAmount;
}
const orderInInfo = result.data.records[0] || {};
return { orderInInfo, materielList };
}
/**
*
*/
@Action
async tluSubmit(list: any[]) {
const obj = {
barcode: list[0].barCode,
loginName: session.loginName,
};
let oneMaterielDetail: any = {};
const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj);
console.log('shneme a ', data.records);
oneMaterielDetail = data.records[0];
data.records[0].materialCode = list[0].productCode;
data.records[0].materialDesc = list[0].productDescZh;
console.log('aaaaa', oneMaterielDetail);
return oneMaterielDetail;
}
/**
*
* @param orderNo
*/
@MutationAction
async confirm(list: any[]) {
const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
console.log('res数据', data, code);
// if (code == '1') {
// uni.showToast({ icon: 'success', title: msg });
// } else {
// uni.showToast({ icon: 'none', title: msg });
// }
const materielList: any = [];
return { code, materielList };
}
}
export default getModule(ReturningModule);

@ -0,0 +1,21 @@
/**
*
*/
import vm from '@/main';
export const headers = [
{
label: vm.$t('message.product_barCode'),
key: 'barcode',
width: 300,
},
{
label: vm.$t('message.product_FGCode'),
key: 'materialCode',
width: 300,
},
{
label: vm.$t('message.product_FGDes'),
key: 'materialDesc',
width: 300,
},
];

@ -0,0 +1,182 @@
<template>
<view class="page-receipt-detail">
<view class="header">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view>
<view class="title">{{ $t('message.CommissionedGoOutDetails') }}</view>
<view class="right"></view>
</view>
<view class="table-wrapper">
<wyb-table
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="model.materielList"
:show-vert-border="false"
></wyb-table>
</view>
<view class="bottom-bar">
<div class="extra">
<u-row class="bottom-info">
<u-col :span="12"
>{{ $t('message.po_Total') }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col
>
<!-- <u-col :span="2">数量</u-col>-->
<!-- <u-col :span="4"><u-input v-model="locationCode"></u-input></u-col>-->
<!-- <u-col :span="3">-->
<!-- <u-button-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- :loading="$wait.is('*changeOrderInLocation')"-->
<!-- @click="changeLocation"-->
<!-- >-->
<!-- 拒收-->
<!-- </u-button>-->
<!-- </u-col>-->
</u-row>
</div>
<!-- <div class="container">-->
<!-- <u-row>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="primary" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">-->
<!-- {{-->
<!-- model.isCheckedAll-->
<!-- ? this.$t('message.po_noSelectAll')-->
<!-- : this.$t('message.po_SelectAll')-->
<!-- }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">-->
<!-- {{ $t('message.po_Submit') }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>-->
<!-- </u-col>-->
<!-- </u-row>-->
<!-- </div>-->
</view>
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import { headers } from './config';
@Component
export default class RawReceiptDetail extends BasePage {
/**
* 页面Module
*/
model = model;
/**
* 库位
*/
locationCode = '';
/**
* 表头
*/
headers = headers;
/**
* 逐条修改
*/
// changeLocation() {
// if (!this.model.hasChecked) {
// uni.showToast({
// icon: 'none',
// title: '',
// });
// return;
// }
// this.model.changeOrderInLocation(this.locationCode);
// }
/**
* 提交
*/
// async onSubmit() {
// await this.model.submitOrderInEnter();
// this.locationCode = '';
// }
}
</script>
<style lang="scss" scoped>
.page-receipt-detail {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 30rpx;
min-height: 100%;
padding-top: 118rpx;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
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;
}
}
.table-wrapper {
background-color: #fff;
}
.form {
background-color: #fff;
padding: 40rpx;
border-radius: 10rpx;
}
.bottom-bar {
z-index: 21;
position: fixed;
bottom: 0;
left: 0;
right: 0;
.container {
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
.extra {
background-color: #fff;
margin: 5px;
border-radius: 5px;
padding: 0 10px;
}
}
}
</style>

@ -0,0 +1,418 @@
<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="back" />
</view>
<view class="title">{{ $t('message.CommissionGoOut') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
<u-form-item :required="true" :label="this.$t('message.CommissionedSingleNumber')" prop="orderNo">
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.orderNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>
</u-form-item>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :required="true" :label="this.$t('message.CommissionedMaterielNo')">
<u-input
v-model="form.productCode"
type="select"
@click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-select
:confirm-text="this.$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')"
v-model="materialCodeSelect"
:list="model.materielList"
@confirm="materialConfirm"
></u-select>
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedMaterielDesc')">
<u-input v-model="form.scanAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedDemandData')">
<u-input v-model="form.orderAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedCumulativeData')">
<u-input v-model="form.scanAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row gutter="0">
<u-col :span="6">
<u-form-item :required="true" :label="this.$t('message.CommissionedLocation')">
<u-input
v-model="form.productCode"
type="select"
@click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-select
:confirm-text="this.$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')"
v-model="materialCodeSelect"
:list="model.materielList"
@confirm="materialConfirm"
></u-select>
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item :label="this.$t('message.CommissionedThisNumber')">
<u-input v-model="form.scanAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
<u-row>
<u-col :span="8"></u-col>
<u-col :span="4">
<u-button :style="{margin:'24rpx 0'}" type="primary">{{$t('message.product_add')}}</u-button>
</u-col>
</u-row>
<u-col :span="12">
<view class="table-wrapper">
<wyb-table
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="materialList"
:show-vert-border="false"
@onCheck="onCheck"
></wyb-table>
</view>
</u-col>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="primary" @click="toPage(page.raw.commission.goOut.detail)">
{{
$t('message.CommissionedGoOutDetails')
}}
</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="resetHandle">{{ $t('message.product_Upload') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="error" @click="onOk">{{ $t('message.po_Return') }}</u-button>
</u-col>
<!-- <u-col :span="3">-->
<!-- <u-button type="success" @click="uni.navigateBack()"></u-button>-->
<!-- </u-col>-->
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
import { session } from '@/store/modules/session';
import { headers } from './config';
@Component
export default class stoOutboundDom extends BasePage {
/**
* 表单引用
*/
@Ref('form') readonly $form!: VForm;
/**
* 表格引用
*/
@Ref('table') readonly $table: any;
/**
* 页面Module
*/
model = model;
/**
* search焦点获取
*/
firstFocus = false;
/**
* 表头
*/
headers = headers;
/**
* 表单数据
*/
form = {
dockCode: null, // code
dockName: null, // name
orderNo: null,
qty: 0,
orderAmount: '',
productCode: '', // name
productDescZh: '',
scanAmount: '',
barCode: '',
};
materialList: any = []; //
//
selectMaterielList: any = [];
/**
* 工位退料人名称
*/
operatorName = '';
/**
* 退料类型选择
*/
returningTypeSelect = false;
//
materialCodeSelect = false;
/**
* 表单验证规则
*/
rules: VFormRules<any> = {
orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }],
};
// onReadyonLoad
async onReady() {
this.$form.setRules(this.rules);
model.queryReturningTypeList();
}
onCheck(e: any) {
console.log('e.data', e.data);
this.selectMaterielList = [];
e.data.forEach((line: any) => {
const { lineData: item } = line;
this.selectMaterielList.push(item);
});
}
back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 });
this.$table.onEmpty();
}
materialConfirm(v: any) {
console.log('v[0].value', v[0]);
// this.form.productCode = v[0].value;
this.model.materielList.forEach((item: any) => {
if (v[0].value == item.stoItem) {
this.form.productCode = item.materialCode;
this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount;
this.form.scanAmount = item.scanAmount;
}
});
console.log('this.form', this.form);
}
/**
* 清空
*/
resetHandle() {
this.materialList = [];
this.$table.onCheckAllTap();
this.model.materielList.forEach((item: any) => {
if (this.form.productCode == item.label) {
this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount;
this.form.scanAmount = item.scanAmount;
}
});
}
/**
* 条码回车
*/
onSubmit() {
this.$form.validate(async (valid: boolean) => {
if (this.form.productCode.slice(0, 9) != this.form.barCode.slice(0, 9)) {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip5') as string });
return;
}
if (parseInt(this.form.orderAmount) <= parseInt(this.form.scanAmount)) {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip6') as string });
return;
}
let list = [
{
order3: this.form.orderNo,
productCode: this.form.productCode,
productDescZh: this.form.productDescZh,
barCode: this.form.barCode,
dockCode: this.form.dockCode,
dockName: this.form.dockName,
orderType: 3,
type: 0,
keepBy: session.loginName as string,
loginName: session.loginName as string,
},
];
if (valid) {
const res = await this.model.tluSubmit(list);
console.log('fanhui ', res);
// if (res.barcode) {
// // this.materialList.push(res);
// this.form.scanAmount = res.scanAmount;
// }
if (this.materialList.length == 0) {
await this.materialList.push(res);
this.form.scanAmount += 1;
this.$table.onCheckAllTap();
} else {
let flag = 0;
for (let i = 0; i < this.materialList.length; i++) {
console.log('11111', this.materialList[i]);
if (this.form.barCode == this.materialList[i].barcode) {
flag = 1;
break;
}
}
if (flag == 0) {
await this.$table.onCheckAllTap();
await this.materialList.push(res);
this.form.scanAmount += 1;
this.$table.onCheckAllTap();
} else {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip7') as string });
}
}
}
});
const item = {
...this.form,
barCode: String(''),
};
this.firstFocus = false;
setTimeout(() => {
this.form = item;
this.firstFocus = true;
}, 0);
}
onOk() {
// if (this.selectMaterielList.length == 0) {
// uni.showToast({ icon: 'none', title: this.$t('message.product_Tip2') as string });
// } else {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
let selctlist: any = [];
this.selectMaterielList.forEach((item: any, index: any) => {
// item.originWl = item.locCode;
selctlist[index] = {
barCode: item.barcode,
keepBy: session.loginName,
loginName: session.loginName,
order3: this.form.orderNo,
orderType: 3,
type: 0,
productCode: item.productCode,
productDescZh: item.productDescZh,
originWl: item.locCode,
dockCode: item.dockCode,
dockName: item.dockName,
whCode: item.whCode,
regionCode: item.regionCode,
};
});
await this.model.confirm(selctlist);
// this.$form.resetFields();
// // this.form.barCode = '';
// this.selectMaterielList = [];
console.log('aaaaaaa', this.model);
if (this.model.code == '1') {
this.materialList = [];
// this.model.materielList = [];
this.$table.onCheckAllTap();
uni.showToast({ icon: 'success', title: 'success' });
}
});
this.form.barCode = '';
this.form.productCode = '';
// this.form.orderNo = null;
this.form.scanAmount = '';
this.form.orderAmount = '';
this.form.productDescZh = '';
this.selectMaterielList = [];
this.$table.onEmpty();
}
// }
}
</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;
}
.button-bar {
}
}
</style>

@ -0,0 +1,122 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { session } from '@/store/modules/session';
// import vm from '@/main';
class OrderInInfo {
stoAmount?: 0;
stoNo?: string; //STO采购单号
orderAmount?: string; //单据总数
Allocated?: string; //已分配
Unallocated?: string; //未分配
}
@Module({
namespaced: true,
dynamic: true,
store,
name: 'product.outbound.stoOutbound',
})
export class ReturningModule extends VuexModule {
/**
*
*/
returningTypeList: any[] = [];
/**
*
*/
materielList: any[] = [];
//条码扫描的返回的结果
oneMaterielDetail: any = {};
/**
*
*/
orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码
code = '';
/**
*
*/
@MutationAction
async queryReturningTypeList() {
const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, {
factoryCode: session.factoryCode,
whCode: session.warehouseCode,
loginName: session.loginName,
});
const returningTypeList = list.map((item: any) => ({
label: item.dockName,
value: item.dockCode,
}));
return { returningTypeList };
}
/**
*
* @param orderNo
*/
@MutationAction
async queryOrderInInfo(stoNo: string) {
const result = await http.post(url.outbound.stoOutbound.info, {
stoNo,
deleteFlag: 2,
finalState: 3,
loginName: session.loginName,
});
let stoAmount = 0;
result.data.records.forEach((item: any) => {
stoAmount += item.orderAmount;
});
const materielList = result.data.records.map((item: any) => ({
label: item.materialCode,
value: item.stoItem,
...item,
}));
console.log('materielList', materielList);
if (result.data.records[0]) {
result.data.records[0].stoAmount = stoAmount;
}
const orderInInfo = result.data.records[0] || {};
return { orderInInfo, materielList };
}
/**
*
*/
@Action
async tluSubmit(list: any[]) {
const obj = {
barcode: list[0].barCode,
loginName: session.loginName,
};
let oneMaterielDetail: any = {};
const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj);
console.log('shneme a ', data.records);
oneMaterielDetail = data.records[0];
data.records[0].materialCode = list[0].productCode;
data.records[0].materialDesc = list[0].productDescZh;
console.log('aaaaa', oneMaterielDetail);
return oneMaterielDetail;
}
/**
*
* @param orderNo
*/
@MutationAction
async confirm(list: any[]) {
const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
console.log('res数据', data, code);
// if (code == '1') {
// uni.showToast({ icon: 'success', title: msg });
// } else {
// uni.showToast({ icon: 'none', title: msg });
// }
const materielList: any = [];
return { code, materielList };
}
}
export default getModule(ReturningModule);

@ -0,0 +1,138 @@
<template>
<view class="page-raw-warehouse">
<view class="header">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="toPage(page.raw.index)" />
</view>
<view class="title">{{ $t('message.RowWarehouse') }}</view>
<view class="right"></view>
</view>
<view class="container">
<u-row :gutter="30">
<!-- <u-col :span="12" v-for="(item, index) in childData" :key="index">
<u-button
@click="
uni.navigateTo({
url: item.href,
})
"
>
<u-icon size="80" :name="item.iconClass"></u-icon>
<text class="name">
{{
session.lang == 'en'
? index + 1 + ' ' + item.engResourceName
: index + 1 + ' ' + item.resourceName
}}</text
>
</u-button>
</u-col>-->
<u-col :span="12">
<u-button @click="toPage(page.raw.commission.entrant.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
<text class="name">1.{{ '委外入库' }}</text>
</u-button>
</u-col>
<u-col :span="12">
<u-button @click="toPage(page.raw.commission.goOut.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
<text class="name">2.{{ '委外出库' }}</text>
</u-button>
</u-col>
<!--
<u-col :span="12">
<u-button @click="toPage(page.raw.warehouse.rowScrap.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
<text class="name">2.{{ $t('message.RowScrap') }}</text>
</u-button>
</u-col>
<u-col :span="12">
<u-button @click="toPage(page.raw.warehouse.rowCollect.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
<text class="name">3.{{ $t('message.RowCollectionAndBorrowing') }}</text>
</u-button>
</u-col>-->
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
@Component
export default class RawAppointment extends BasePage {
childData: any;
onLoad(option: { childData: any }) {
this.childData = option//JSON.parse(option.childData);
}
}
</script>
<style lang="scss" scoped>
.page-raw-warehouse {
background-color: #f4f7fc;
padding-top: 88rpx;
min-height: 100%;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
background-color: #255cea;
height: 88rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
box-shadow: 0 1rpx 5rpx #6b90ef;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
.container {
margin-top: 36rpx;
padding: 30rpx 15rpx 0;
.u-row {
}
.u-col {
margin-bottom: 30rpx;
}
.u-btn {
height: 160rpx;
padding: 0 28rpx;
border: 1px solid #f0f5fc;
color: #42465a;
font-size: 30rpx;
font-weight: 400;
&:after {
border-color: #f0f5fc;
border-radius: 4rpx;
}
.name {
flex: 1;
margin-left: 28rpx;
text-align: left;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
}
</style>

@ -30,6 +30,12 @@
>
</u-button>
</u-col>
<u-col :span="12">
<u-button @click="toPage(page.raw.commission.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
<text class="name">5.{{ '委外' }}</text>
</u-button>
</u-col>
<!-- <u-col :span="12">
<u-button @click="toPage(page.raw.ingoods.index)">
<u-icon size="80" name="/static/icons/icon-02.png"></u-icon>

@ -27,6 +27,7 @@
>
</u-button>
</u-col>
<!-- <u-col :span="12">
<u-button @click="toPage(page.raw.ingoods.poReceipt.index)">
<u-icon size="80" name="/static/icons/icon-14.png"></u-icon>

@ -133,9 +133,19 @@ export const page = {
},
rowInventory: {
index: "/pages/raw/warehouse/rowInventory/index",
details: "/pages/raw/warehouse/rowInventory/details",
},
},
commission:{
index: "/pages/raw/commission/index",
entrant:{
index: "/pages/raw/commission/entrant/index",
detail: "/pages/raw/commission/entrant/detail",
},
goOut:{
index: "/pages/raw/commission/goOut/index",
detail: "/pages/raw/commission/goOut/detail",
}
}
},
SemiProduct: {
index: "/pages/SemiProduct/index",

Loading…
Cancel
Save