退料,包材等修改&质量样式适配

master
guoshuang 11 months ago
parent 199cc961e8
commit 4b430dead6

@ -631,6 +631,14 @@
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
},
{
"path": "pages/wms/Raw/ReturnMaterials/index",
"style": {
"navigationBarTitleText": "退料",
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
} }

@ -13,7 +13,7 @@ export class SparepartsInto extends VuexModule {
orderNoItemList: any = []; orderNoItemList: any = [];
@MutationAction @MutationAction
async queryOrderNo(orderNo: any) { async queryOrderNo(orderNo: any) {
const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); const result: any = await http.post(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode, { materialCode: orderNo });
const orderNoItemList = result.data; const orderNoItemList = result.data;
return { orderNoItemList }; return { orderNoItemList };
} }

@ -13,7 +13,7 @@ export class SparepartsIntoOut extends VuexModule {
orderNoItemList: any = []; orderNoItemList: any = [];
@MutationAction @MutationAction
async queryOrderNo(orderNo: any) { async queryOrderNo(orderNo: any) {
const result: any = await http.get(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode + orderNo); const result: any = await http.post(url.lanjuequipment.product.SparepartsInto.querySpareDetailBySpareCode, { materialCode: orderNo });
const orderNoItemList = result.data; const orderNoItemList = result.data;
return { orderNoItemList }; return { orderNoItemList };
} }

@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version); // console.log('Version////', this.Version);
} }
///****************** ///******************
version = '0.0.108'; // version = '0.0.109'; //
//version = '0.0.14'; // //version = '0.0.14'; //
//*************** false true **************** //*************** false true ****************
//isTest = true; //isTest = true;

@ -2037,8 +2037,8 @@ export default class PurchaseWHSRM extends BasePage {
text-align: center; text-align: center;
background: #5a9cf8; background: #5a9cf8;
color: #ffffff; color: #ffffff;
margin-top: 5px; margin-top: 10rpx;
padding: 5px; padding: 10rpx;
} }
.page-product-receipt { .page-product-receipt {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat; background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
@ -2173,7 +2173,7 @@ export default class PurchaseWHSRM extends BasePage {
text-align: center; text-align: center;
background: #fa3534; background: #fa3534;
color: #ffffff; color: #ffffff;
margin-top: 10px; margin-top: 20rpx;
} }
.zhuangtai { .zhuangtai {
@ -2302,11 +2302,11 @@ export default class PurchaseWHSRM extends BasePage {
z-index: 9999; /* 确保遮罩层在最上层 */ z-index: 9999; /* 确保遮罩层在最上层 */
} }
.selectlist { .selectlist {
margin-top: 15px; margin-top: 30rpx;
border-radius: 5px; border-radius: 10rpx;
// border: rgba(121, 121, 121, 1) solid 1px; // border: rgba(121, 121, 121, 1) solid 1px;
// background-color: #ffffff; // background-color: #ffffff;
padding: 7px 8px 7px 12px; padding: 14rpx 16rpx 14rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
.item-name { .item-name {
.quest { .quest {
@ -2314,17 +2314,17 @@ export default class PurchaseWHSRM extends BasePage {
// border-radius: 5px; // border-radius: 5px;
// border: rgba(121, 121, 121, 1) solid 1px; // border: rgba(121, 121, 121, 1) solid 1px;
// background-color: #ffffff; // background-color: #ffffff;
padding: 7px 8px 7px 12px; padding: 14rpx 16rpx 14rpx 24rpx;
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
font-size: 18px; font-size: 36rpx;
} }
.details { .details {
display: flex; display: flex;
font-size: 15px; font-size: 30rpx;
// justify-content: space-between; // justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 8px; margin-bottom: 16rpx;
} }
} }
.single-left { .single-left {
@ -2332,22 +2332,22 @@ export default class PurchaseWHSRM extends BasePage {
// align-items: center; // align-items: center;
// justify-content: space-around; // justify-content: space-around;
text-align: center; text-align: center;
margin-top: 12px; margin-top: 24rpx;
margin-bottom: 20px; margin-bottom: 40rpx;
border: 1px solid #eee; border: 2rpx solid #eee;
} }
.item { .item {
margin-top: 15px; margin-top: 30rpx;
width: 344px; width: 100%;
border-radius: 5px; border-radius: 10rpx;
border: rgba(121, 121, 121, 1) solid 1px; border: rgba(121, 121, 121, 1) solid 2rpx;
// background-color: #ffffff; // background-color: #ffffff;
padding: 7px 8px 7px 8px; padding: 14rpx 16rpx 14rpx 16rpx;
box-sizing: border-box; box-sizing: border-box;
.item1 { .item1 {
margin-bottom: 3px; margin-bottom: 6rpx;
white-space: 1px; white-space: 2rpx;
font-size: 15px; font-size: 30rpx;
font-weight: 600; font-weight: 600;
} }
.item2 { .item2 {
@ -2355,28 +2355,28 @@ export default class PurchaseWHSRM extends BasePage {
align-items: center; align-items: center;
// justify-content: space-between; // justify-content: space-between;
.select { .select {
font-size: 15px; font-size: 30rpx;
font-weight: 400; font-weight: 400;
display: flex; display: flex;
// margin-left: 19px; // margin-left: 19px;
} }
.input-box { .input-box {
font-size: 13px; font-size: 26rpx;
font-weight: 400; font-weight: 400;
display: flex; display: flex;
align-content: center; align-content: center;
margin-top: 2px; margin-top: 4rpx;
.input { .input {
font-size: 12px; font-size: 24rpx;
width: 56%; width: 56%;
padding: 1px 8px; padding: 2rpx 16rpx;
height: 27px; height: 54rpx;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #b6b6b6; border: 2rpx solid #b6b6b6;
margin-left: 6px; margin-left: 12rpx;
display: inline-block; display: inline-block;
margin-right: 6px; margin-right: 12rpx;
border-radius: 4px; border-radius: 8rpx;
position: relative; position: relative;
} }
} }
@ -2390,27 +2390,27 @@ export default class PurchaseWHSRM extends BasePage {
} }
.modal { .modal {
.upload-name { .upload-name {
padding: 6px 20px; padding: 12rpx 40rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.name { .name {
font-size: 17px; font-size: 34rpx;
font-weight: 600; font-weight: 600;
} }
} }
.tagsbox { .tagsbox {
padding: 10px 20px; padding: 20rpx 40rpx;
.tags { .tags {
margin-right: 5px; margin-right: 10rpx;
} }
} }
} }
.Belowsform3 { .Belowsform3 {
background-color: #fff; background-color: #fff;
padding: 7px 8px 7px 12px; padding: 14rpx 16rpx 14rpx 24rpx;
.u-form-item { .u-form-item {
line-height: 35rpx; line-height: 35rpx;
font-size: 16px; font-size: 32rpx;
} }
.photoList { .photoList {
display: flex; display: flex;
@ -2492,14 +2492,14 @@ export default class PurchaseWHSRM extends BasePage {
} }
::v-deep .uni-input-placeholder { ::v-deep .uni-input-placeholder {
font-weight: 500; font-weight: 500;
left: 10px; left: 20rpx;
} }
::v-deep .uni-textarea-placeholder { ::v-deep .uni-textarea-placeholder {
font-weight: 500; font-weight: 500;
} }
::v-deep .Belowsform3 .uni-input-input { ::v-deep .Belowsform3 .uni-input-input {
width: 97%; width: 97%;
border: 1px solid #dcdfe6; border: 2rpx solid #dcdfe6;
} }
.selected-form { .selected-form {
background-color: #f0f0f0; /* 示例背景色 */ background-color: #f0f0f0; /* 示例背景色 */

@ -175,30 +175,30 @@ export default class RawAppointment extends BasePage {
} }
.container1 { .container1 {
width: 280px; width: 560rpx;
margin: auto; margin: auto;
box-shadow: 0px 0px 6px 0px #a6a3a3; box-shadow: 0rpx 0rpx 12rpx 0rpx #a6a3a3;
border-radius: 3px; border-radius: 6rpx;
padding: 20rpx; padding: 20rpx;
.title { .title {
font-weight: 600; font-weight: 600;
} }
.content { .content {
margin-top: 10px; margin-top: 20rpx;
.menu1 { .menu1 {
width: 49%; width: 49%;
text-align: center; text-align: center;
.item1 { .item1 {
margin-top: 10px; margin-top: 20rpx;
} }
.item2 { .item2 {
margin-top: 10px; margin-top: 20rpx;
margin-bottom: 10px; margin-bottom: 20rpx;
color: #94d1f4; color: #94d1f4;
} }
} }
.menu1active { .menu1active {
border-right: 1px solid #d8d6d6; border-right: 2rpx solid #d8d6d6;
} }
} }
} }

@ -18,6 +18,9 @@
<u-button type="primary" @click="tidan"></u-button> <u-button type="primary" @click="tidan"></u-button>
</view> </view>
</view> </view>
<u-form-item label="物料">
<jPicker sureColor="#ff0000" @bindpicker="selectProductCodeType" showKey="label" valKey="value" :val="bimWl.value" :options="reducelist" />
</u-form-item>
<!-- 订单 --> <!-- 订单 -->
<!-- <u-form-item label="物料描述"> <!-- <u-form-item label="物料描述">
<jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" /> <jPicker sureColor="#ff0000" :showCode="true" @bindpicker="bookTypeChange" duoyukey="procureCode" showKey="label" valKey="value" :val="aimWl.value" :options="materilist" />
@ -216,6 +219,8 @@ export default class receivePO extends BasePage {
clickitem: any = ''; clickitem: any = '';
productCodeList: any = {}; productCodeList: any = {};
receiptNoCode = ''; receiptNoCode = '';
reducelist: any = [];
oldprodlist: any = [];
async onReady() { async onReady() {
//await this.model.Stashlist(); //await this.model.Stashlist();
//this.whList = model.DictTypeList; //this.whList = model.DictTypeList;
@ -291,16 +296,17 @@ export default class receivePO extends BasePage {
url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)), url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)),
}); });
} }
uniqueArray(arr) {
return arr.reduce((accumulator, current) => {
if (!accumulator.some((item) => item.materialCode === current.materialCode)) {
accumulator.push(current);
}
return accumulator;
}, []);
}
// //
async query() { async query() {
console.log(session); console.log(session);
// if (this.procureCode == '' || this.procureCode.length == 0) {
// (this.$refs.uToast as any).show({
// title: 'rfid',
// type: 'default',
// });
// return;
// }
this.aimWl = {} as OptionType; this.aimWl = {} as OptionType;
let query = { let query = {
procureCode: this.procureCode, procureCode: this.procureCode,
@ -311,7 +317,14 @@ export default class receivePO extends BasePage {
}; };
await this.model.PurchaseOrderPda(query); await this.model.PurchaseOrderPda(query);
let materilist = model.orderNoItemList; let materilist = model.orderNoItemList;
this.list = materilist.map((item) => { this.reducelist = this.uniqueArray(materilist);
this.reducelist.forEach((item) => {
item.value = item.materialCode;
item.label = item.materialDesc;
});
console.log('this.reducelist', this.reducelist);
this.bimWl = this.reducelist[0];
this.oldprodlist = materilist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return { return {
...item, ...item,
@ -319,8 +332,19 @@ export default class receivePO extends BasePage {
realityaddNumber: item.realityNumber, realityaddNumber: item.realityNumber,
}; };
}); });
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
});
this.receivedlist = []; this.receivedlist = [];
} }
selectProductCodeType(e) {
console.log(e);
this.bimWl = e.pickerName;
this.receivedlist = [];
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
});
}
// //
async tidan() { async tidan() {
@ -420,6 +444,7 @@ export default class receivePO extends BasePage {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: '成功', title: '成功',
type: 'success', type: 'success',
duration: 6000,
}); });
this.receiptNoCode = ''; this.receiptNoCode = '';
this.receivedlist = []; this.receivedlist = [];

@ -19,6 +19,9 @@
<u-button type="primary" @click="tidandelivery"></u-button> <u-button type="primary" @click="tidandelivery"></u-button>
</view> </view>
</view> </view>
<u-form-item label="物料">
<jPicker sureColor="#ff0000" :showCode="true" @bindpicker="selectProductCodeType" showKey="label" valKey="value" :val="bimWl.value" :options="reducelist" />
</u-form-item>
<u-form-item label="库区"> <u-form-item label="库区">
<u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search> <u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
<!-- <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodeTypeList.value" :options="whList" /> --> <!-- <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" showKey="label" valKey="value" :val="productCodeTypeList.value" :options="whList" /> -->
@ -181,6 +184,8 @@ export default class receiveSRM extends BasePage {
waCodeTypeList: any = {}; waCodeTypeList: any = {};
moren = '选择仓库'; moren = '选择仓库';
moren1 = '选择库区'; moren1 = '选择库区';
reducelist: any = [];
oldprodlist: any = [];
waylist = [ waylist = [
// { // {
// value: '0', // value: '0',
@ -215,11 +220,6 @@ export default class receiveSRM extends BasePage {
clickitem: any = ''; clickitem: any = '';
productCodeList: any = {}; productCodeList: any = {};
receiptNoCode = ''; receiptNoCode = '';
async onReady() {
//await this.model.Stashlist();
// this.whList = model.DictTypeList;
//this.remove = this.model.WlList[0];
}
// //
generate() { generate() {
const today = dayjs().format('YYYYMMDDHHmmss'); const today = dayjs().format('YYYYMMDDHHmmss');
@ -237,83 +237,6 @@ export default class receiveSRM extends BasePage {
this.czNumber = ''; this.czNumber = '';
} }
// //
async onOk() {
console.log(this.form3);
// if (this.form3.incomeBatchNo == '' || this.form3.incomeBatchNo == undefined) {
// (this.$refs.uToast as any).show({
// title: '',
// type: 'default',
// });
// return;
// }
if (this.form3.planNumber == '' || this.form3.planNumber == undefined) {
(this.$refs.uToast as any).show({
title: '数量不能为空',
type: 'default',
});
return;
}
if (this.form3.sn == '' && this.selectway == true) {
(this.$refs.uToast as any).show({
title: '托盘号不能为空',
type: 'default',
});
return;
}
if (this.productCodeTypeList.value == '' || this.productCodeTypeList.value == undefined) {
(this.$refs.uToast as any).show({
title: '请选择仓库',
type: 'default',
});
return;
}
if (this.waCodeTypeList.value == '' || this.waCodeTypeList.value == undefined) {
(this.$refs.uToast as any).show({
title: '请选择库区',
type: 'default',
});
return;
}
if (this.receiptNoCode == '' || this.receiptNoCode == undefined) {
(this.$refs.uToast as any).show({
title: '请先生成收货单号',
type: 'default',
});
return;
}
console.log('1234567');
let query = this.clickitem;
// query.applyList = this.Sparepartlist;
query.workStatus = this.form3.workStatus;
if (this.selectway == true) {
query.sn = this.form3.sn;
} else {
query.sn = dayjs().format('YYYYMMDDHHmmss');
}
query.planNumber = this.form3.planNumber;
query.whCode = this.productCodeTypeList.warehouseCode;
query.waCode = this.waCodeTypeList.value;
query.factoryCode = session.FactoryCode;
query.userDefined6 = this.form3.userDefined6;
query.receiptNoCode = this.receiptNoCode;
query.poLine = this.clickitem.userDefined3;
await this.model.PurchaseOrderdeliPda(query);
console.log(this.model.SubmitCode);
if (this.model.SubmitCode.code == 200) {
(this.$refs.uToast as any).show({
title: '成功',
type: 'default',
});
this.show = false;
this.query();
// this.ProcureOrderAlready();
} else {
(this.$refs.uToast as any).show({
title: '失败',
type: this.model.SubmitCode.msg,
});
}
}
async onFormDoubleClick(item) { async onFormDoubleClick(item) {
console.log('双击', item); console.log('双击', item);
//await this.model.OnSubmit(item.id); //await this.model.OnSubmit(item.id);
@ -324,6 +247,14 @@ export default class receiveSRM extends BasePage {
url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)), url: this.page.wms.ReceivePODetail + '?listitem=' + encodeURIComponent(JSON.stringify(item)),
}); });
} }
uniqueArray(arr) {
return arr.reduce((accumulator, current) => {
if (!accumulator.some((item) => item.materialCode === current.materialCode)) {
accumulator.push(current);
}
return accumulator;
}, []);
}
// //
async query() { async query() {
console.log(session); console.log(session);
@ -344,7 +275,14 @@ export default class receiveSRM extends BasePage {
}; };
await this.model.PurchaseOrderPda(query); await this.model.PurchaseOrderPda(query);
let prodlist = model.orderNoItemList; let prodlist = model.orderNoItemList;
this.list = prodlist.map((item) => { this.reducelist = this.uniqueArray(prodlist);
this.reducelist.forEach((item) => {
item.value = item.materialCode;
item.label = item.materialDesc;
});
console.log('this.reducelist', this.reducelist);
this.bimWl = this.reducelist[0];
this.oldprodlist = prodlist.map((item) => {
let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
return { return {
...item, ...item,
@ -352,9 +290,19 @@ export default class receiveSRM extends BasePage {
realityaddNumber: item.realityNumber, realityaddNumber: item.realityNumber,
}; };
}); });
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
});
this.receivedlist = []; this.receivedlist = [];
} }
selectProductCodeType(e) {
console.log(e);
this.bimWl = e.pickerName;
this.receivedlist = [];
this.list = this.oldprodlist.filter((item) => {
return item.materialCode == this.bimWl.value;
});
}
// //
async tidandelivery() { async tidandelivery() {
if (this.userDefined5 == '' || this.userDefined5.length == 0) { if (this.userDefined5 == '' || this.userDefined5.length == 0) {
@ -477,6 +425,7 @@ export default class receiveSRM extends BasePage {
(this.$refs.uToast as any).show({ (this.$refs.uToast as any).show({
title: model.submitmsg, title: model.submitmsg,
type: 'primary', type: 'primary',
duration: 6000,
}); });
this.receiptNoCode = ''; this.receiptNoCode = '';
this.receivedlist = []; this.receivedlist = [];

@ -0,0 +1,662 @@
<template>
<view class="page-product-receipt">
<view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view>
<view class="title">退料</view>
<view class="right"></view>
</view>
<view class="fiexdcontent">
<u-form class="form" ref="form" label-width="180rpx">
<u-form-item label="退料单">
<u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
</u-form-item>
<u-form-item label="库区">
<u-search placeholder="请扫描" v-model="areaCode" @search="queryloc" :show-action="false"></u-search>
</u-form-item>
<u-form-item label="仓库">
{{ waCodeList && waCodeList.warehouseName }}
</u-form-item>
<u-form-item label="标志卡">
<u-search placeholder="请扫描" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
</u-form-item>
</u-form>
<u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" :style="{ marginTop: '1rpx', backgroundColor: item.planNumber <= item.returnNumber ? '#4eea9b59' : '#ffffff' }" class="form3">
<view class="list">
<view class="row-list">
<view style="width: 25%" class="list-item"> 退料单: </view>
<view style="width: 80%"> {{ item.produceCode }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 物料编码: </view>
<view style="width: 80%"> {{ item.handlematerialCode }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 物料名称: </view>
<view style="width: 80%"> {{ item.materialDesc }} </view>
</view>
<view class="row-list">
<view class="row-list-item1">
<view class="list-item"> 计划/已退: </view>
<view> {{ item.planNumber }}/{{ item.returnNumber }} </view>
</view>
<view class="row-list-item2">
<view class="list-item"> 单位: </view>
<view> {{ item.unit }} </view>
</view>
</view>
</view>
</u-form>
</view>
<!-- <view style="height: 14rpx"></view> -->
<view class="scroll">
<view v-for="(item, index) in list" :key="item.id">
<u-form style="margin-top: 10rpx" class="form2">
<view class="list">
<view class="rowleft">
<view class="row-list">
<view style="width: 30%" class="list-item"> 标志卡: </view>
<view> {{ item.userDefined1 }} </view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 物料编码: </view>
<view> {{ item.handlematerialCode }} </view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 物料名称: </view>
<view> {{ item.materialDesc }} </view>
</view>
<view class="row-list">
<view class="list-item"> 数量: </view>
<u-input border placeholder="" @blur="confirmNumber(item)" v-model="item.planNumber" />
</view>
<view a:if="true" class="righttitle">
<view @click.stop="delet(item, index)" class="boder-icon-rigth"> 删除 </view>
</view>
</view>
</view>
</u-form>
</view>
</view>
<view class="bottom-bar">
<u-row class="button-bar">
<!-- 确定 -->
<u-col :span="6">
<u-button @click="onSubmit" type="primary">确认出库</u-button>
</u-col>
<!-- 返回 -->
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})"></u-button>
</u-col>
</u-row>
</view>
<u-toast ref="uToast" />
</view>
</template>
<script lang="ts">
import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import jPicker from '@/components/J-Picker/jPicker.vue';
import model from './model';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
//import { session } from '@/store/modules/session';
@Component({
components: {
jPicker,
},
})
export default class ReturnMaterials extends BasePage {
model = model;
list: any = [];
aimWl = {} as OptionType;
bimWl = {} as OptionType;
cimWl = {} as OptionType;
boxnumber: any = '';
materilist = [];
userDefined1list = [];
warehouselist = [];
Idcard: any = '';
TraysList: any = {};
areaCode = '';
waCodeList: any = {};
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
// this.remove = this.model.WlList[0];
// }
// selectItem(e: any) {
// this.remove = e.pickerName;
// }
orderNo: any = '';
border = true;
orderNoItemList: any = [];
showProduceCodeList: any = [];
itemdetail: any = '';
outNumber: any = 0;
realityaddNumber = 0;
async queryloc() {
let params = {
factoryCode: session.FactoryCode,
areaCode: this.areaCode,
};
await this.model.getworkloc(params);
this.waCodeList = model.workloclist;
}
//
async query() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入退料单号',
// url: '/pages/user/index'
});
return;
}
await this.model.ProductionMaterialRequisition(this.orderNo);
if (model.orderNoItemList) {
this.materilist = [];
this.list = [];
this.materilist = model.orderNoItemList;
this.materilist.forEach((item) => {
item.returnoutNumber = item.returnNumber;
item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
});
} else {
this.materilist = [];
}
}
async querybyidcard() {
if (this.list.length) {
let ischongfu = this.list.some((item) => item.wlCode == this.Idcard);
if (ischongfu) {
(this.$refs.uToast as any).show({
title: '请勿重复扫描标志卡',
});
this.Idcard = '';
return;
}
}
let item = {
factoryCode: session.FactoryCode,
userDefined1: this.Idcard,
};
await this.model.getByidcard(item);
if (model.getidcardcode == '200') {
let alreadyList = model.byidcardobj;
alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
this.materilist.forEach((item) => {
if (item.id == alreadyList.userDefined4) {
item.returnNumber = item.returnNumber + alreadyList.planNumber;
//alreadyList.produceCode = item.produceCode;
}
});
//alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
this.list.push(alreadyList);
this.Idcard = '';
}
}
confirmNumber(changeobj) {
let addnumber = 0;
this.list.forEach((item) => {
if (item.userDefined4 == changeobj.userDefined4) {
addnumber += parseFloat(item.planNumber ? item.planNumber : '0');
}
});
this.materilist.forEach((item) => {
if (item.id == changeobj.userDefined4) {
item.returnNumber = item.returnoutNumber + addnumber;
}
});
}
async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入退料单号',
// url: '/pages/user/index'
});
return;
}
if (this.areaCode == '') {
(this.$refs.uToast as any).show({
title: '请先扫描或输入库区',
type: 'default',
});
return;
}
if (Object.keys(this.waCodeList).length == 0) {
(this.$refs.uToast as any).show({
title: '没有仓库信息',
type: 'default',
});
return;
}
if (this.list.length == 0 || this.list == '') {
(this.$refs.uToast as any).show({
title: '请先扫描标志卡',
// url: '/pages/user/index'
});
return;
}
let params = [];
this.list.map((item) => {
params.push({
createBy: session.loginName,
factoryCode: session.FactoryCode,
whCode: this.areaCode,
waCode: this.waCodeList.warehouseCode,
planNumber: item.planNumber,
procureCode: item.procureCode,
userDefined6: item.userDefined1,
materialCode: item.materialCode,
materialDesc: item.materialDesc,
userDefined3: item.userDefined4,
sn: item.userDefined1,
});
});
await this.model.out(params);
if (this.model.SubmitCode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
type: 'success',
});
this.mepty();
//this.getlist();
} else {
(this.$refs.uToast as any).show({
title: '失败',
type: 'error',
});
//this.getlist();
}
}
mepty() {
this.list = [];
this.materilist = [];
this.areaCode = '';
this.waCodeList = {};
this.query();
}
delet(deletobj, index) {
this.list.splice(index, 1);
this.materilist.forEach((item) => {
if (item.id == deletobj.userDefined4) {
item.returnNumber -= deletobj.planNumber;
}
});
(this.$refs.uToast as any).show({
title: '删除成功',
type: 'success',
});
}
}
</script>
<style>
body {
background-color: rgb(242, 242, 242);
}
</style>
<style lang="scss" scoped>
.page-product-receipt {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
.header {
position: fixed;
top: 0rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
height: 120rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
padding: 45rpx 0rpx 0rpx;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
// .fiexdcontent {
// position: fixed;
// width: 92%;
// box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%);
// z-index: 100;
// }
.form {
background-color: #fff;
padding: 15rpx;
border-radius: 10rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.u-form-item {
padding: 20rpx 0;
line-height: 35rpx;
.Transfer {
width: 280rpx;
height: 64rpx;
background: rgb(242, 242, 242);
border-radius: 110rpx;
}
}
.single {
width: 100%;
height: 60rpx;
display: flex;
.single-left {
width: 80%;
height: 100%;
display: flex;
view {
width: 142rpx;
height: 100%;
line-height: 55rpx;
}
}
.single-right {
button {
// margin-top: 15rpx;
width: 140rpx;
height: 70rpx;
background-color: #fa3534;
}
}
}
.row {
display: flex;
flex-direction: row;
justify-content: space-around;
flex: 1;
}
}
.form3 {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
height: 240rpx;
overflow: scroll;
margin-bottom: 6rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
//color: #8d8989;
// .list {
// display: flex;
// flex-direction: row;
// }
.row-list {
display: flex;
flex-direction: row;
justify-content: space-between;
.row-list-item {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.row-list-item1 {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 50%;
}
.row-list-item2 {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.list-item {
display: flex;
flex-direction: row;
// flex: 1;
}
}
.righttitle {
display: flex;
justify-content: flex-end;
.boder-icon-rigth {
border: 1rpx solid #fa3534;
width: 130rpx;
text-align: center;
background: #fa3534;
color: #ffffff;
margin-top: 10px;
}
}
}
.form4 {
background-color: #fff;
padding: 18rpx;
border-radius: 10rpx;
margin-top: 2rpx;
.u-input__input {
min-height: 36px;
}
}
.scroll {
// margin-top: 2rpx;
// height: 680rpx;
// overflow: scroll;
// position: absolute;
// width: 92%;
// top: 740rpx;
// /* bottom: 40px; */
// overflow: auto;
// background-color: #f2f2f2;
.form2 {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
color: #8d8989;
.list {
// display: flex;
// flex-direction: row;
.rowleft {
// width: 80%;
.row-list {
display: flex;
flex-direction: row;
justify-content: space-between;
.row-list-item {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.list-item {
display: flex;
flex-direction: row;
//flex: 1;
}
}
.righttitle {
display: flex;
justify-content: flex-end;
.boder-icon-rigth {
border: 1rpx solid #fa3534;
width: 130rpx;
text-align: center;
background: #fa3534;
color: #ffffff;
margin-top: 10px;
}
}
}
.rowright {
width: 20%;
display: flex;
justify-content: right;
.righttitle {
width: 60%;
background-color: #8d898947;
color: red;
text-align: center;
/* margin: auto; */
height: 100%;
line-height: 70rpx;
}
}
}
// .righttitle {
// display: flex;
// justify-content: flex-end;
// .boder-icon-rigth {
// border: 1rpx solid #fa3534;
// width: 130rpx;
// text-align: center;
// background: #fa3534;
// color: #ffffff;
// margin-top: 10px;
// }
// .zhuangtai {
// background: #a7a0a04a;
// width: 224rpx;
// margin-right: -27rpx;
// border: 2rpx solid #a7a0a04a;
// border-radius: 12rpx;
// text-align: center;
// margin-bottom: 10rpx;
// }
// .zhuangtai[data-state='1'] {
// color: green;
// }
// .zhuangtai[data-state='0'] {
// color: blue;
// }
// }
}
}
.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 {
}
.photoList {
display: flex;
padding-top: 12rpx;
.chooseBtn {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
border: 2rpx dashed #e2e2e2;
display: flex;
justify-content: center;
align-items: center;
.inner {
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.desc {
font-size: 28rpx;
font-weight: 400;
color: #24252a;
line-height: 40rpx;
}
.img {
width: 50rpx;
height: 50rpx;
margin-bottom: 6rpx;
}
}
.photoBox {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
position: relative;
.closeBtn {
position: absolute;
top: -12rpx;
right: -12rpx;
z-index: 2;
width: 36rpx;
height: 36rpx;
.img {
width: 36rpx;
height: 36rpx;
}
}
.img {
width: 202rpx;
height: 202rpx;
border-radius: 12rpx;
}
}
.itemBox {
flex: 0 0 202rpx;
margin-right: 20rpx;
&:last-child {
margin-right: 0;
}
}
// /deep/ .remarksBox textarea {
// font-size: 24rpx;
// }
}
}
</style>

@ -0,0 +1,113 @@
import { 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';
@Module({
namespaced: true,
dynamic: true,
store,
name: 'page.Raw.ReturnMaterials',
})
export class ReturnMaterials extends VuexModule {
orderNoItemList: any = [];
@MutationAction
async ProductionMaterialRequisition(orderNo: any) {
const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.listReturnSC, {
produceCode: orderNo,
factoryCode: session.FactoryCode,
});
// http.defaults.headers.common['Accept-Language'] = session.PoolName;
const orderNoItemList = result.data;
return { orderNoItemList };
}
information: any = [];
@MutationAction
async queryinformation(item: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, {
...item,
factoryCode: session.FactoryCode,
});
const information = result.data.map((element: any) => ({
label: element.userDefined1,
value: element.userDefined1,
...element,
}));
return { information };
}
TraysList: any = {};
@MutationAction
async showTrays(item: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, {
...item,
factoryCode: session.FactoryCode,
});
const TraysList = result.data[0];
return { TraysList };
}
SubmitCode: any = '';
selloutconntraydata: any = {};
@MutationAction
async selloutconntray(params: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisitionsn, {
sn: params,
factoryCode: session.FactoryCode,
});
const SubmitCode = result.code;
const selloutconntraydata = result.data;
return { SubmitCode, selloutconntraydata };
}
@MutationAction
async deleteTray(item: any) {
console.log(item);
const result: any = await http.delete(url.lanjuwms.product.SaleOutWH.deleteTray + '/' + item.barcode);
const SubmitCode = result.code;
return { SubmitCode };
}
@MutationAction
async out(params: any) {
const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.addReturnSC, params);
const SubmitCode = result.code;
return { SubmitCode };
}
warehouselist: any = [];
@MutationAction
async getwarehouselist() {
const result = await http.post(url.lanjuwms.raw.ProductionREQ.warehouselist, {
factoryCode: session.FactoryCode,
});
const warehouselist = result.data.map((element: any) => ({
label: element.warehouseName,
value: element.warehouseCode,
...element,
}));
return { warehouselist };
}
///扫描标志卡
getidcardcode: any = '';
byidcardobj: any = {};
@MutationAction
async getByidcard(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReturnMaterials.selectOrderCardTL, data);
const getidcardcode = result.code;
const byidcardobj = result.data;
return { getidcardcode, byidcardobj };
}
//最新仓库查询
workloclist: any = {};
@MutationAction
async getworkloc(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReceivePO.listTableCK, data);
const workloclist = result.data;
// let workloclist = oldworkloclist.map((item: any) => ({
// label: item.warehouseName,
// value: item.warehouseCode,
// ...item,
// }));
//let wacode = oldwacode[0].areaCode;
return { workloclist };
}
}
export default getModule(ReturnMaterials);

@ -159,6 +159,11 @@ export const url = {
ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC', ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/ProductionMaterialRequisitionSC',
NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC', NewConMaterialOutSC: qianzhuione + '/wms/WmsToWCSmission/NewConMaterialOutSC',
}, },
ReturnMaterials: {
listReturnSC: qianzhuione + '/wms/WmsToWCSmission/listReturnSC',
addReturnSC: qianzhuione + '/wms/WmsToWCSmission/addReturnSC',
selectOrderCardTL: qianzhuione + '/wms/WmsToWCSmission/selectOrderCardTL',
},
TrayStatusUpdate: { TrayStatusUpdate: {
out: qianzhuione + '/wms/order/TraystatusUpdate', out: qianzhuione + '/wms/order/TraystatusUpdate',
}, },

Loading…
Cancel
Save