cosmoim-852 fix 新增备件发货功能

master
hou 3 years ago
parent 3d1d891198
commit 2b1d022f14

@ -489,5 +489,8 @@ export default {
totalNum: '累计数量', totalNum: '累计数量',
Operation: '操作人', Operation: '操作人',
StorageTime: '入库时间', StorageTime: '入库时间',
spareGoods: '备件发货',
matcode: '物料编码',
Quantity: '需求数量',
}, },
}; };

@ -494,5 +494,8 @@ export default {
totalNum: 'total Num', totalNum: 'total Num',
Operation: 'Operation', Operation: 'Operation',
StorageTime: 'Storage Time', StorageTime: 'Storage Time',
spareGoods: 'Spare deliver goods',
matcode: 'Mat code',
Quantity: 'Request',
}, },
}; };

@ -493,7 +493,7 @@
{ {
"path": "pages/raw/handover/feeding/Location", "path": "pages/raw/handover/feeding/Location",
"style": { "style": {
"navigationBarTitleText": "补料明细", "navigationBarTitleText": "补料",
"navigationStyle": "custom", // "navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black- "navigationBarTextStyle": "white" // white-black-
} }
@ -842,10 +842,26 @@
"navigationBarTextStyle": "white" // white-black- "navigationBarTextStyle": "white" // white-black-
} }
}, },
{
"path": "pages/product/outbound/SpareDeliverGoods/detail",
"style": {
"navigationBarTitleText": "备件发货明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{ {
"path": "pages/raw/ingoods/SpareInbound/Inbound/Local-details", "path": "pages/raw/ingoods/SpareInbound/Inbound/Local-details",
"style": { "style": {
"navigationBarTitleText": "备件明细", "navigationBarTitleText": "备件入库明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/handover/feeding/RUS-Location",
"style": {
"navigationBarTitleText": "俄罗斯补料",
"navigationStyle": "custom", // "navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black- "navigationBarTextStyle": "white" // white-black-
} }

@ -4,18 +4,8 @@
import vm from '@/main'; import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.product_barCode'), label: vm.$t('message.dn_OddNumbers'),
key: 'barcode', key: 'order1',
width: 300,
},
{
label: vm.$t('message.product_FGCode'),
key: 'productCode',
width: 300,
},
{
label: vm.$t('message.product_FGDes'),
key: 'productDescZh',
width: 300, width: 300,
}, },
{ {
@ -23,4 +13,34 @@ export const headers = [
key: 'order2', key: 'order2',
width: 300, width: 300,
}, },
{
label: vm.$t('message.matcode'),
key: 'productCode',
width: 300,
},
{
label: vm.$t('message.po_MaterielDes'),
key: 'productDescZh',
width: 300,
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'locCode',
width: 300,
},
{
label: vm.$t('message.CommissionedGoOutNumber'),
key: 'qty',
width: 300,
},
{
label: vm.$t('message.Operation'),
key: 'createdBy',
width: 300,
},
{
label: vm.$t('message.operatingTime'),
key: 'createdDate',
width: 300,
},
]; ];

@ -0,0 +1,103 @@
<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.detailList" :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-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 {
model = model;
headers = headers;
}
</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>

@ -4,66 +4,53 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="back" /> <u-icon class="icon" name="arrow-left" @click="back" />
</view> </view>
<view class="title">{{ $t('message.deliver') }}</view> <view class="title">{{ $t('message.spareGoods') }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx"> <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
<!-- 单号查询 --> <!-- 单号查询 -->
<u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="orderNo"> <u-form-item :required="true" :label="$t('message.dn_OddNumbers')" prop="orderNo">
<u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="form.orderNo" @search="query" :show-action="false"></u-search> <u-search :placeholder="$t('message.Commission_tips1')" v-model.trim="nxOutCode" @search="query" :show-action="false"></u-search>
<view class="single-right"> <view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button> <u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view> </view>
</u-form-item> </u-form-item>
<!-- 单据总数 --> <!-- 物料编码 -->
<u-form-item :label="$t('message.product_TotalNumber')"> <u-form-item :required="true" :label="$t('message.matcode')">
<u-input v-model="model.orderInInfo.stoAmount" :disabled="true" type="number" placeholder="" /> <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="materialConfirm" showKey="value" valKey="value" :val="form.materialCode" class="search" :options="model.materielList" />
</u-form-item> </u-form-item>
<!-- 成品编码 --> <!-- 物料描述 -->
<u-form-item :required="true" :label="$t('message.product_FGCode')"> <u-form-item :label="$t('message.product_MaterialDes')">
<!-- <u-input v-model="form.rowItem" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.po_PleaseInput')" /> <u-input :disabled="true" v-model="form.materialDesc" placeholder="" style="overflow: hidden" />
<u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select> -->
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="materialConfirm" showKey="value" valKey="value" :val="form.rowItem" class="search" :options="model.materielList" />
</u-form-item>
<!-- 成品描述 -->
<u-form-item :label="$t('message.product_FGDes')">
<u-input :disabled="true" v-model="form.productDescZh" placeholder="" style="overflow: hidden" />
</u-form-item> </u-form-item>
<!-- 行项目 --> <!-- 行项目 -->
<u-form-item :label="$t('message.Line')"> <u-form-item :label="$t('message.Line')">
<u-input :disabled="true" v-model="form.row" placeholder="" /> <u-input :disabled="true" v-model="form.rowItem" placeholder="" />
</u-form-item> </u-form-item>
<!-- 物料总数 --> <!-- 需求数量 -->
<u-row gutter="0"> <u-form-item :label="$t('message.Quantity')">
<u-col :span="6"> <u-input v-model="form.orderAmount" :disabled="true" type="number" placeholder="" />
<u-form-item :label="$t('message.product_MaterilTotalNumber')"> </u-form-item>
<u-input v-model="form.orderAmount" placeholder="" :disabled="true" /> <!-- 累计出库数量 -->
</u-form-item> <u-form-item :label="$t('message.totalNum')">
</u-col> <u-input v-model="form.outAmount" :disabled="true" type="number" placeholder="" />
<u-col :span="6"> </u-form-item>
<u-form-item :label="$t('message.product_Swept')" label-width="80rpx"> <!-- 库位 -->
<u-input v-model="form.scanAmount" :disabled="true" :placeholder="$t('message.po_PleaseInput')" type="number" /> <u-form-item :required="true" :label="$t('message.CommissionedLocation')">
</u-form-item> <jPicker sureColor="#ff0000" @bindpicker="wlcodeChange" showKey="value" valKey="value" :val="wlcode.value" :options="model.wlcodeList" :focus="true" />
</u-col> </u-form-item>
</u-row> <!-- 数量 -->
<!-- 扫码 --> <u-form-item :label="$t('message.dn_Number')">
<u-form-item :label="$t('message.product_BarCode')"> <u-input v-model="qty" :placeholder="$t('message.Summary_PleaseInputNumber')" :border="border" />
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.barCode" @search="onOk" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item> </u-form-item>
<!-- <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> </u-form>
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
<!-- Guoshuang 详细跳转要改调接口 -->
<u-col :span="6"> <u-col :span="6">
<u-button type="warning" @click="detailed">{{ $t('message.detailed') }}</u-button> <u-button type="warning" @click="detailed">{{ $t('message.detailed') }}</u-button>
</u-col> </u-col>
<u-col :span="6"> <u-col :span="6">
<u-button type="primary" @click="Posting">{{ $t('message.Posting') }}</u-button> <u-button type="primary" @click="Posting">{{ $t('message.po_Submit') }}</u-button>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
@ -71,12 +58,9 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Ref } from 'vue-property-decorator'; import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page'; import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import model from './model'; import model from './model';
import { session } from '@/store/modules/session';
import { headers } from './config';
import jPicker from '@/components/J-Picker/jPicker.vue'; import jPicker from '@/components/J-Picker/jPicker.vue';
@Component({ @Component({
components: { components: {
@ -84,280 +68,82 @@ import jPicker from '@/components/J-Picker/jPicker.vue';
}, },
}) })
export default class stoOutboundDom extends BasePage { export default class stoOutboundDom extends BasePage {
@Ref('form') readonly $form!: VForm; border: true;
@Ref('table') readonly $table: any;
model = model; model = model;
firstFocus = false; form: any = {};
headers = headers; nxOutCode = '';
form = { wlcode: any = '';
dockCode: null, // code
dockName: null, // name
orderNo: null,
qty: 0,
orderAmount: '',
productCode: '', // name
productDescZh: '',
scanAmount: 0,
rowItem: '',
row: '',
barCode: '',
};
wl: any = '';
rowItemIndex: any = null;
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() { async onReady() {
this.$form.setRules(this.rules); await this.model.querywocodeList();
await model.queryReturningTypeList(); this.wlcode = this.model.wlcodeList[0];
if (uni.getStorageSync('SweepCode')) {
this.form.orderNo = JSON.parse(uni.getStorageSync('SweepCode'));
uni.removeStorageSync('SweepCode');
this.query();
}
} }
back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 });
}
//
async detailed() {
if (!this.form.orderNo) {
this.customToast(this.$t('message.Commission_tips1') as any);
return;
}
await this.model.queryDetailed(this.form.orderNo);
this.toPage(this.page.product.outbound.stoOutboundDetail);
}
BackSweep() {
if (!this.form.orderNo) {
this.customToast(this.$t('message.Commission_tips1') as any);
return;
}
uni.setStorageSync('SweepCode', JSON.stringify(this.form.orderNo));
this.toPage(this.page.product.outbound.Back);
}
//
async query() { async query() {
if (!this.form.orderNo) { if (this.nxOutCode == '') {
this.customToast(this.$t('message.Commission_tips1') as any); this.customToast(this.$t('message.Commission_tips1') as any);
return; return;
} }
await this.model.findProdInfoByDN(this.form.orderNo); await this.model.queryReturningTypeList(this.nxOutCode);
console.log('model.DNcode', this.model.DNcode); if (this.model.findSpareInfoByDNCode == '1') {
if (this.model.DNcode == '1') {
uni.showToast({ uni.showToast({
//icon: 'success',
title: this.$t('message.successful') as any, title: this.$t('message.successful') as any,
duration: 2000, duration: 2000,
image: '/static/icons/icon-51.png', image: '/static/icons/icon-51.png',
}); });
if (this.rowItemIndex == null) { this.form = this.model.beijianList[0];
this.form.productCode = this.model.materielList[0].materialCode;
this.form.productDescZh = this.model.materielList[0].materialDesc;
this.form.rowItem = this.model.materielList[0].materialCode;
this.form.row = this.model.materielList[0].rowItem;
this.form.orderAmount = this.model.materielList[0].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount);
this.rowItemIndex = this.model.materielList[0].rowItem;
} else {
let rowIndex: any = null;
this.model.materielList.forEach((item: any, index) => {
if (item.rowItem == this.rowItemIndex) {
rowIndex = index;
}
});
if (rowIndex == null) {
this.form.productCode = this.model.materielList[0].materialCode;
this.form.productDescZh = this.model.materielList[0].materialDesc;
this.form.rowItem = this.model.materielList[0].materialCode;
this.form.row = this.model.materielList[0].rowItem;
this.form.orderAmount = this.model.materielList[0].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount);
this.rowItemIndex = this.model.materielList[0].rowItem;
} else {
this.form.productCode = this.model.materielList[rowIndex].materialCode;
this.form.productDescZh = this.model.materielList[rowIndex].materialDesc;
this.form.rowItem = this.model.materielList[rowIndex].materialCode;
this.form.row = this.model.materielList[rowIndex].rowItem;
this.form.orderAmount = this.model.materielList[rowIndex].orderAmount;
this.form.scanAmount = parseFloat(this.model.materielList[rowIndex].outAmount);
}
}
} }
} }
// materialConfirm(e: any) {
materialConfirm(v: any) { this.form = this.model.beijianList[e.pickerVal];
this.model.materielList.forEach((item: any) => {
if (v.pickerName.materialCode == item.materialCode) {
this.form.productCode = item.materialCode;
this.form.productDescZh = item.materialDesc;
this.form.rowItem = item.materialCode;
this.form.row = item.rowItem;
this.rowItemIndex = item.rowItem;
this.form.orderAmount = item.orderAmount;
this.form.scanAmount = parseFloat(item.outAmount);
return;
}
});
console.log('this.form', this.form);
} }
/** wlcodeChange(e: any) {
* 清空 this.wlcode = e.pickerName;
*/
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.rowItem = item.rowItem;
this.form.scanAmount = parseFloat(item.outAmount);
}
});
} }
// async detailed() {
Posting() { if (this.nxOutCode.length == 0) {
if (!this.form.orderNo) { this.customToast(this.$t('message.Warehouse_Tip1') as any);
this.customToast(this.$t('message.Commission_tips1') as string);
return; return;
} }
uni.showModal({ await this.model.queryDetailed(this.nxOutCode);
title: this.$t('message.ConfirmPosting') as string, // this.toPage(this.page.product.SpareDeliverGoods.detail);
success: async (res) => { this.redirectTo(this.page.product.SpareDeliverGoods.detail);
if (res.confirm) {
let params = {
nxOutCode: this.form.orderNo,
rowItem: this.form.row,
materialCode: this.form.rowItem,
loginName: session.loginName,
factoryCode: session.factoryCode,
};
await this.model.Posting(params);
if (this.model.PostingCode == '1') {
uni.showToast({
title: this.$t('message.Warehouse_Tip9') as any,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.empty();
}
} else if (res.cancel) {
return;
}
},
});
} }
empty() { qty: any = '';
this.form.dockCode = null; async Posting() {
this.form.dockName = null; if (this.form == {}) {
this.form.orderNo = null; this.customToast(this.$t('message.Commission_tips6') as any);
this.form.qty = 0; return;
this.form.orderAmount = ''; }
this.form.productCode = ''; if (this.wlcode == '' || this.qty == '' || parseFloat(this.qty) <= 0) {
this.form.productDescZh = ''; this.customToast(this.$t('message.Commission_tips2') as any);
this.form.scanAmount = 0; return;
this.form.rowItem = ''; }
this.form.row = ''; if (parseFloat(this.qty) > parseFloat(this.form.orderAmount) || parseFloat(this.qty) + parseFloat(this.form.outAmount) > parseFloat(this.form.orderAmount)) {
this.form.barCode = ''; this.customToast(this.$t('message.Commission_tips4') as any);
this.rowItemIndex = null; return;
this.model.empty(); }
} let params = {
onOk() { nxOutCode: this.nxOutCode,
this.$form.validate(async (valid: boolean) => { rowItem: this.form.rowItem,
if (!valid) return; materialCode: this.form.materialCode,
if (parseInt(this.form.orderAmount) <= this.form.scanAmount) { materialDesc: this.form.materialDesc,
this.customToast(this.$t('message.product_Tip6') as string); locCode: this.wlcode.label,
return; qty: this.qty,
} };
if (this.form.barCode == '') { await this.model.submitbj(params);
this.customToast(this.$t('message.barcode') as string); if (this.model.submitCode == '1') {
return; uni.showToast({
} title: this.$t('message.Warehouse_Tip9') as any,
const selctlist = { duration: 2000,
barcode: this.form.barCode, image: '/static/icons/icon-51.png',
loginName: session.loginName,
factoryCode: session.factoryCode,
keepBy: session.loginName,
order3: this.form.orderNo,
orderItem: this.form.row,
type: 0,
orderType: 4,
productCode: this.form.productCode,
};
await this.model.confirmMove(selctlist).then(async () => {
if (this.model.code == '1') {
this.materialList = [];
uni.showToast({
//icon: 'success',
title: 'success',
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.form.barCode = '';
this.form.productCode = '';
model.orderInInfo.stoAmount = 0;
this.form.scanAmount = 0;
this.form.orderAmount = '';
this.form.productDescZh = '';
this.selectMaterielList = [];
this.form.rowItem = '';
this.query();
}
if (this.model.code == '2') {
uni.showModal({
content: this.$t('message.sweep') as any,
cancelText: this.$t('message.Cancel') as any,
confirmText: this.$t('message.workArea_Confirm') as any,
success: async (res) => {
if (res.confirm) {
let params = {
barcode: this.form.barCode,
loginName: session.loginName,
keepBy: session.loginName,
factoryCode: session.factoryCode,
order3: this.form.orderNo,
};
await this.model.delCode(params);
this.form.barCode = '';
this.form.productCode = '';
model.orderInInfo.stoAmount = 0;
this.form.scanAmount = 0;
this.form.orderAmount = '';
this.form.productDescZh = '';
this.selectMaterielList = [];
this.form.rowItem = '';
this.query();
} else if (res.cancel) {
this.form.barCode = '';
}
},
});
}
}); });
}); this.qty = '';
this.form = {};
await this.query();
}
}
back() {
uni.navigateBack({ delta: 1 });
} }
// }
} }
</script> </script>

@ -1,231 +1,74 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store'; import store from '@/store';
import http from '@/utils/request'; import http from '@/utils/request';
import { url } from '@/utils/url'; import { url } from '@/utils/url';
import { session } from '@/store/modules/session'; import { session } from '@/store/modules/session';
// import vm from '@/main';
class OrderInInfo {
stoAmount?: 0;
stoNo?: string; //STO采购单号
orderAmount?: string; //单据总数
Allocated?: string; //已分配
Unallocated?: string; //未分配
}
@Module({ @Module({
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.outbound.SpareDeliverGoods', name: 'product.outbound.SpareDeliverGoods',
}) })
export class ReturningModule extends VuexModule { export class ReturnModule extends VuexModule {
/** materielList: any = []; //备件发货 物料列表
* beijianList: any = []; //备件发货 数据列表
*/ findSpareInfoByDNCode: any = ''; //备件发货 查询单号接口code返回值
returningTypeList: any[] = [];
PostingCode: any = '';
/**
*
*/
materielList: any[] = [];
//条码扫描的返回的结果
oneMaterielDetail: any = {};
/**
*
*/
orderInInfo: OrderInInfo = new OrderInInfo();
resCode: any = '';
//记账按钮的code码
code = '';
DNcode: any = '';
/**
*
*/
@MutationAction @MutationAction
async queryReturningTypeList() { async queryReturningTypeList(nxOutCode: string) {
const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, { const res: any = await http.post(url.outbound.stoOutbound.findSpareInfoByDN, {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
whCode: session.warehouseCode,
loginName: session.loginName, loginName: session.loginName,
});
const returningTypeList = list.map((item: any) => ({
label: item.dockName,
value: item.dockCode,
}));
return { returningTypeList };
}
/**
*
* @param orderNo
*/
@MutationAction
async queryOrderInInfo(nxOutCode: string) {
const result = await http.post(url.outbound.stoOutbound.info, {
nxOutCode, nxOutCode,
deleteFlag: 2,
finalState: 3,
loginName: session.loginName,
}); });
let stoAmount = 0; const findSpareInfoByDNCode = res.code;
result.data.records.forEach((item: any) => { const beijianList = res.data;
stoAmount += item.orderAmount; const materielList = res.data.map((item: any) => ({
});
const materielList = result.data.records.map((item: any) => ({
label: item.materialCode, 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 };
}
/**
*
*/
@MutationAction
async findProdInfoByDN(nxOutCode: string) {
const result: any = await http.post(url.outbound.stoOutbound.findProdInfoByDN, {
nxOutCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
console.log('resule>>>>>>>>>>>>>>>>>>>>>>>', result);
let stoAmount = 0;
const DNcode = result.code;
result.data.forEach((item: any) => {
stoAmount += item.orderAmount;
});
const materielList = result.data.map((item: any) => ({
value: item.materialCode, value: item.materialCode,
rowItem: item.rowItem,
label: item.rowItem + '(' + item.materialCode + ')',
...item,
})); }));
console.log('materielList', materielList); return { beijianList, materielList, findSpareInfoByDNCode };
if (result.data[0]) {
result.data[0].stoAmount = stoAmount;
}
const orderInInfo = result.data[0] || {};
return { orderInInfo, materielList, DNcode };
}
//退扫
@MutationAction
async delCode(params: any = {}) {
const res: any = await http.post(url.outbound.stoOutbound.del, params);
const resCode = res.code;
return { resCode };
}
/**
*
*/
@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;
}
/**
*
*/
@Action
async getMaterialByCode(list: any = {}) {
let oneMaterielDetail: any = {};
const { data }: any = await http.post(url.outbound.stoOutbound.getMaterialByCode, list);
oneMaterielDetail = data.records[0];
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 };
}
/**
*
* @param orderNo
*/
@MutationAction
async confirmMove(list: any) {
const res: any = await http.post(url.outbound.stoOutbound.Bookkeeping, list);
console.log('res数据', res);
const code = res.code;
// if (code == '1') {
// uni.showToast({ icon: 'success', title: msg });
// } else {
// uni.showToast({ icon: 'none', title: msg });
// }
const materielList: any = [];
return { code, materielList };
}
/**
*
* @param orderNo
*/
@MutationAction
async queryDetailed(order1: string) {
const { code, data } = await http.post(url.outbound.stoOutbound.getDetailByorderNo, {
order1,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
console.log('res数据', data, code);
const materielList = data;
console.log('>>>>>>>', materielList);
return { code, materielList };
} }
//退扫接口 wlcodeList: any = [];
@MutationAction @MutationAction
async BackSweep(params: any) { async querywocodeList() {
const res: any = await http.post(url.outbound.stoOutbound.scanBarcodeDN, params); const data: any = await http.get(url.inbound.finishProductOffline.kuwei, {
console.log('res>>>>>>>>>>>>>>>>>>>>>>>>.', res); params: {
const code = res.code; factoryCode: session.factoryCode,
return { code }; loginName: session.loginName,
warehouseCode: session.warehouseCode,
},
});
const wlcodeList = data.data.map((item: any) => ({
label: item.locationCode,
value: item.locationCode + '(' + item.sendSpot + ')',
}));
return { wlcodeList };
} }
//退扫查询接口
submitCode: any = '';
@MutationAction @MutationAction
async queryAmount(params: any) { async submitbj(params: any) {
const res: any = await http.post(url.outbound.stoOutbound.queryAmount, params); const res: any = await http.post(url.outbound.stoOutbound.confirmSpareDeliver, {
console.log('退扫>>>>>>>>>>>>>>>>>>>>>>>>.', res); factoryCode: session.factoryCode,
return {}; loginName: session.loginName,
...params,
});
const submitCode = res.code;
return { submitCode };
} }
//过账
detailList: any = [];
@MutationAction @MutationAction
async Posting(params: any) { async queryDetailed(order1: any) {
const res: any = await http.post(url.outbound.stoOutbound.Posting, params); const res: any = await http.post(url.outbound.stoOutbound.querySpareListInfoByDnNo, {
const PostingCode = res.code; factoryCode: session.factoryCode,
return { PostingCode }; loginName: session.loginName,
} order1,
@MutationAction });
async empty() { const detailList = res.data;
const orderInInfo = {}; return { detailList };
return { orderInInfo };
} }
} }
export default getModule(ReturningModule); export default getModule(ReturnModule);

@ -14,41 +14,8 @@
<div class="extra"> <div class="extra">
<u-row class="bottom-info"> <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="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> </u-row>
</div> </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>
</view> </view>
</template> </template>
@ -61,42 +28,8 @@ import { headers } from './config';
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawReceiptDetail extends BasePage {
/**
* 页面Module
*/
model = model; model = model;
/**
* 库位
*/
locationCode = '';
/**
* 表头
*/
headers = headers; 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> </script>

@ -0,0 +1,653 @@
<template>
<view class="page-raw-receipt">
<view class="top"></view>
<view class="header">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="back" />
</view>
<view class="title">{{ $t('message.FillingMaterials') }}</view>
<view class="right"></view>
</view>
<view class="content">
<!-- 单号 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.InventoryOrderNo') }}:</view>
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="form.documentNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- 物料 -->
<view class="material">
<view class="material-left">
<view>{{ $t('message.CommissionedMaterielNo') }}:</view>
<jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="some.materialCode" class="search" :options="materialList" />
</view>
</view>
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.CommissionedMaterielDesc') }}:</view>
<view class="material-right-code" style="overflow: hidden">{{ some.materialDesc }}</view>
</view>
</view>
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.Feeding_ReplenishedQuantity') }}:</view>
<view class="material-right-code" style="overflow: hidden">{{ some.totalFillAmount }}</view>
</view>
</view>
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.Replenishment_Number') }}:</view>
<view class="material-right-code" style="overflow: hidden">{{ some.amount }}</view>
</view>
</view>
<!-- 列表展示数据 -->
<view class="number">
<view class="number-left">
<view class="number-left-title">{{ $t('message.Pi_Station') }}:</view>
<u-input v-model="some.sendSpot" placeholder=" " :type="type" :border="border" class="input" disabled style="padding: '0'" />
</view>
<view class="number-right">
<view class="number-right-title">{{ $t('message.total') }}:</view>
<u-input placeholder=" " v-model="some.fillAmount" :type="type" :border="border" class="input" style="padding: '0'" disabled />
</view>
</view>
<!-- 库位 -->
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}:</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
</view>
<view class="library-right">
<view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
<u-input :placeholder="$t('message.po_PleaseInput')" v-model="qty" type="number" :border="border" class="input" />
</view>
</view>
<!-- 容器编码 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Container') }}:</view>
<u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
</view>
</view>
<!-- 添加 -->
<view class="add">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
</view>
<!-- 表格 -->
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="detailHeader" :contents="LocationList" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
</view>
<view class="bottom-bar">
<div class="extra">
<u-form ref="form" :model="form" :error-type="['toast']">
<u-row class="bottom-info"> </u-row>
</u-form>
</div>
<u-form ref="form2" :model="form2" :error-type="['toast']" style="background: rgb(255, 255, 255)">
<u-row class="bottom-info">
<u-col :span="6">
<u-form-item prop="operatorPass" :label="$t('message.Summary_Receiver')" label-width="120rpx">
<u-input v-model="operatorName" :border="border" @confirm="onOperatorConfirm" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
<u-col :span="6">
<u-form-item prop="rfPwd" :label="$t('message.Summary_Password')">
<u-input v-model="form2.rfPwd" :border="border" type="password" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item>
</u-col>
</u-row>
</u-form>
<div class="container">
<u-row>
<u-col :span="4">
<u-button type="primary" class="appoint" @click="bill">{{ $t('message.Feeding_ReplenishmentDetails') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="success" @click="onSubmit">
{{ $t('message.product_Upload') }}
</u-button>
</u-col>
<u-col :span="4">
<u-button type="error" @click="uni.navigateBack()">
{{ $t('message.po_Return') }}
</u-button>
</u-col>
</u-row>
</div>
</view>
</view>
</template>
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import { session } from '@/store/modules/session';
import { VForm, VFormRules } from 'vue/types/form';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { detailHeader } from './config';
import { auth } from '@/store/modules/auth';
@Component({
components: {
jPicker,
},
})
export default class RawReceiptDetail extends BasePage {
/**
* 表单引用
*/
@Ref('form') readonly $form!: VForm;
@Ref('submitForm') readonly $submitForm!: VForm;
@Ref('form2') readonly $form2!: VForm;
submitForm = {
receiver: '',
receiverName: '',
password: '',
};
model = model;
materialList: any = [];
type = 'text';
wlCode: any = '';
border = true;
operatorName = '';
//
LocationList: any = [];
//
Location: any = [];
someIndex = 0;
some: any = {};
qty: any = '';
form: any = {
documentNo: '',
amount: null,
};
form2 = {
operatorPass: '', //
rfPwd: '',
};
rules: VFormRules<any> = {
amount: [{ required: true, message: this.$t('message.Pi_tip1') as string }],
};
detailHeader = detailHeader;
sapSupplyIdList: any = [];
// async onReady() {
// let content = {
// loginName: session.loginName,
// sendSpot: null,
// factoryCode: session.factoryCode,
// workArea: session.workareaCode,
// };
// let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content);
// console.log('res>>>>>>>>>>>>>>>>>>>>>>', res);
// res.forEach((item: any) => {
// let pickerName: any = {};
// pickerName.label = item.locationCode;
// pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
// pickerName.sendSpot = item.sendSpot;
// this.Location.push(pickerName);
// });
// this.model.blDetailList.forEach((item: any) => {
// item.receiptAmount = 0;
// item.wlQTyList = [];
// });
// this.model.blDetailList.length = 0;
// this.wlCode = this.Location[0];
// }
empty() {
this.some = {};
this.someIndex = 0;
this.qty = '';
this.Location = [];
this.wlCode = '';
this.materialList = [];
this.model.blDetailList.length = 0;
}
LocEmpty() {
this.some = {};
this.someIndex = 0;
this.qty = '';
this.wlCode = '';
this.materialList = [];
this.model.blDetailList.length = 0;
this.LocationList = [];
}
async back() {
if (this.sapSupplyIdList.length != 0) {
await this.lock();
}
uni.navigateBack({ delta: 1 });
}
async lock() {
await this.model.lock(this.sapSupplyIdList);
}
async query() {
if (this.form.documentNo == '') {
this.customToast(this.$t('message.Commission_tips1') as string);
}
if (this.sapSupplyIdList.length != 0) {
await this.lock();
this.sapSupplyIdList = [];
}
this.LocEmpty();
this.wlCode = this.Location[0];
let inPrdOrderList = this.form.documentNo.split(',');
let params = {
inPrdOrderList,
};
await this.model.queryBlDetailList(params).then(() => {
this.model.blDetailList.forEach((item: any) => {
let arr = {
label: item.materialCode,
value: item.materialCode,
sapSupplyId: item.sapSupplyId,
};
this.materialList.push(arr);
item.wlList = [];
this.sapSupplyIdList.push(item.sapSupplyId);
});
console.log('this.sapSupplyIdList', this.sapSupplyIdList);
this.some = this.model.blDetailList[0];
this.someIndex = 0;
});
await this.model.queryItemLoc({
workArea: session.workareaCode,
loginName: session.loginName,
sendSpot: null,
materialCode: this.some.materialCode,
factoryCode: session.factoryCode,
});
if (this.model.LocList.length != 0) {
this.Location = [];
this.Location = this.model.LocList;
this.wlCode = this.Location[0];
} else {
console.log('1');
}
}
async materialChoice(e: any) {
this.model.blDetailList.forEach((item: any, index: any) => {
if (item.sapSupplyId == e.pickerName.sapSupplyId) {
this.some = item;
this.someIndex = index;
}
});
await this.model.queryItemLoc({
workArea: session.workareaCode,
loginName: session.loginName,
sendSpot: null,
materialCode: this.some.materialCode,
factoryCode: session.factoryCode,
});
if (this.model.LocList.length != 0) {
this.Location = [];
this.Location = this.model.LocList;
this.wlCode = this.Location[0];
} else {
console.log('1');
}
this.qty = '';
}
LocationChoice(e: any) {
this.wlCode = e.pickerName;
}
async onOperatorConfirm(loginName: string) {
try {
const { userName } = await auth.getUserInfo({ loginName });
this.form2.operatorPass = loginName;
this.operatorName = userName;
} catch {
this.form2.operatorPass = '';
this.operatorName = '';
}
}
Barcode: any = '';
async searchBarcode() {
if (this.Barcode == '') {
this.customToast(this.$t('message.barcode') as string);
return;
}
await this.model.searchBarcode(this.Barcode);
}
Add() {
if (this.qty == '' || this.wlCode == '') {
this.customToast(this.$t('message.AppendMateriel1') as string);
return;
}
if (parseFloat(this.qty) <= 0) {
this.customToast(this.$t('message.AppendMateriel2') as string);
return;
}
if (parseFloat(this.qty) > model.blDetailList[this.someIndex].amount) {
this.customToast(this.$t('message.AppendMateriel3') as string);
return;
}
let num = parseFloat(this.qty);
this.model.blDetailList[this.someIndex].wlList.forEach((item: any) => {
num += parseFloat(item.qty);
});
if (num > this.model.blDetailList[this.someIndex].amount) {
this.customToast(this.$t('message.AppendMateriel3') as string);
return;
}
let isTrue = true;
if (this.LocationList.length != 0) {
this.model.blDetailList[this.someIndex].wlList.forEach((item: any) => {
if (this.wlCode.sendSpot != item.Code) {
this.customToast(this.$t('message.AppendMateriel4') as string);
return (isTrue = false);
}
});
}
if (this.some == {}) {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
if (isTrue == true) {
let arr = {
wlCode: this.wlCode.label,
qty: this.qty,
Code: this.wlCode.sendSpot,
...this.some,
};
this.LocationList.push(arr);
this.model.blDetailList[this.someIndex].wlList.push(arr);
this.qty = '';
this.business();
}
}
deleteItem(e: any): void {
uni.showModal({
content: this.$t('message.product_Delete') as string,
cancelText: this.$t('message.Cancel') as string,
confirmText: this.$t('message.workArea_Confirm') as string,
success: (res) => {
if (res.confirm) {
let lineData = e.lineData;
let i: any;
this.model.blDetailList.forEach((item: any, index: any) => {
if (item.materialCode == lineData.materialCode && item.sendSpot == lineData.sendSpot) {
i = index;
}
});
let NextIndex: any;
this.model.blDetailList[i].wlList.forEach((item: any, index: any) => {
if (item.wlCode == lineData.wlCode && item.qty == lineData.qty) {
NextIndex = index;
}
});
this.model.blDetailList[i].wlList.splice(NextIndex, 1);
this.LocationList.splice(e.contentIndex, 1);
let num: any = 0;
this.model.blDetailList[i].wlList.forEach((item: any) => {
num += parseFloat(item.qty);
});
this.model.blDetailList[i].fillAmount = num;
console.log('this.model.blDetailList', this.model.blDetailList);
} else if (res.cancel) {
return;
}
},
});
}
business() {
let num = 0;
this.model.blDetailList[this.someIndex].wlList.forEach((item: any) => {
num += parseFloat(item.qty);
});
this.model.blDetailList[this.someIndex].fillAmount = num;
this.some.fillAmount = num;
console.log('this.model.blDetailList', this.model.blDetailList);
}
async bill() {
if (this.some == {} || this.some.prdOrder == null) {
this.customToast(this.$t('message.Commission_tips6') as string);
return;
}
let person = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any);
let content = {
loginName: person.session.user.loginName,
prdOrder: this.some.prdOrder,
};
await this.model.querydetaildlist(content);
this.redirectTo(this.page.raw.handover.feeding.Local);
}
async onSubmit() {
this.model.blDetailList.forEach((item: any) => {
item.wlList.forEach((item: any) => {
item.wlList = null;
});
});
let dataList = this.model.blDetailList;
const params = {
dataList,
...this.form2,
factoryCode: this.session.factoryCode,
loginName: this.session.loginName,
};
await this.model.saveBlDetailUpload(params).then(() => {
this.qty = '';
this.LocationList = [];
this.sapSupplyIdList = [];
this.query();
});
}
}
</script>
<style lang="scss" scoped>
.page-raw-receipt {
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;
}
}
.content {
width: 100%;
background: white;
border-radius: 15rpx;
padding: 10rpx;
.single {
width: 100%;
height: 100rpx;
display: flex;
.single-left {
width: 80%;
height: 100%;
display: flex;
view {
width: 110rpx;
height: 100%;
line-height: 100rpx;
}
}
.single-right {
button {
margin-top: 15rpx;
width: 150rpx;
height: 70rpx;
}
}
}
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-left {
width: 100%;
height: 100%;
display: flex;
view {
width: 145rpx;
line-height: 100rpx;
}
.search {
padding-left: 12px;
}
}
}
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-right {
width: 100%;
height: 100%;
display: flex;
.material-right-title {
width: 145rpx;
height: 100%;
line-height: 100rpx;
}
.material-right-code {
width: 80%;
height: 100%;
line-height: 100rpx;
text-align: left;
padding-left: 10px;
// line-height: 100rpx;
}
}
}
.number {
height: 100rpx;
display: flex;
.number-left {
width: 50%;
height: 100%;
display: flex;
.number-left-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
margin-left: 15rpx;
}
}
.number-right {
width: 50%;
height: 100%;
display: flex;
.number-right-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
text-align: center;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
margin-left: 15rpx;
}
}
}
.library {
width: 100%;
height: 100rpx;
display: flex;
.library-left {
width: 50%;
height: 100%;
display: flex;
view {
width: 100rpx;
line-height: 100rpx;
}
.search {
padding-left: 19px;
text-align: left;
}
}
.library-right {
width: 50%;
height: 100%;
display: flex;
.library-right-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
text-align: center;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
margin-left: 15rpx;
}
}
}
.add {
width: 100%;
height: 100rpx;
position: absolute;
top: 462px;
left: 0;
button {
position: absolute;
top: 3rpx;
right: 35rpx;
}
}
}
.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;
}
.bottom-info {
.u-form-item {
padding: 0;
}
}
}
}
</style>

@ -207,6 +207,17 @@ export class FeedingModule extends VuexModule {
console.log(res); console.log(res);
return {}; return {};
} }
//俄罗斯补料扫描容器码
@MutationAction
async searchBarcode(barcode: any) {
const res: any = await http.post(url.auth.query.barcode, {
factoryCode: session.factoryCode,
loginName: session.loginName,
barcode,
});
console.log('res', res);
return {};
}
@Action({ commit: 'updateCheckedOrderInInfoListKw' }) @Action({ commit: 'updateCheckedOrderInInfoListKw' })
async queryByFactoryCodeAndWorkAreaCode(content: any) { async queryByFactoryCodeAndWorkAreaCode(content: any) {
const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content); const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content);

@ -33,6 +33,9 @@ export const page = {
Back: '/pages/product/outbound/stoOutbound/Back', Back: '/pages/product/outbound/stoOutbound/Back',
stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail', stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail',
}, },
SpareDeliverGoods: {
detail: '/pages/product/outbound/SpareDeliverGoods/detail',
},
warehouse: { warehouse: {
index: '/pages/product/warehouse/index', index: '/pages/product/warehouse/index',
wholeTransfer: { wholeTransfer: {

@ -28,6 +28,7 @@ export const url = {
queryAppendDetail: '/wmspda/bl/queryAppendDetail', queryAppendDetail: '/wmspda/bl/queryAppendDetail',
createAppendList: '/wmspda/bl/createAppendList', createAppendList: '/wmspda/bl/createAppendList',
lock: '/wmspda/bl/unlock', lock: '/wmspda/bl/unlock',
barcode: '/wmspda/bl/getOdsRawStorageSnNew',
}, },
systime: '/wmspda/auth/systime', systime: '/wmspda/auth/systime',
userInfo: '/wmspda/auth/userinfo', userInfo: '/wmspda/auth/userinfo',
@ -131,6 +132,8 @@ export const url = {
info: '/wmspda/material/orderout/queryStoPlan', info: '/wmspda/material/orderout/queryStoPlan',
findProdInfoByDN: '/wmspda/fg/findProdInfoByDN', findProdInfoByDN: '/wmspda/fg/findProdInfoByDN',
yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse', yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse',
findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN',
confirmSpareDeliver: '/wmspda/fg/confirmSpareDeliver',
Bookkeeping: '/wmspda/fg/scanBarcodeDN', Bookkeeping: '/wmspda/fg/scanBarcodeDN',
close: '/wmspda/material/outsourcing/close', close: '/wmspda/material/outsourcing/close',
// Bookkeeping: '/wmspda/fg/confirmMove', // Bookkeeping: '/wmspda/fg/confirmMove',
@ -138,6 +141,7 @@ export const url = {
del: '/wmspda/fg/scanBarcodeDN/del', del: '/wmspda/fg/scanBarcodeDN/del',
getMaterialByCode: '/wmspda/fg/getMaterialByCode', getMaterialByCode: '/wmspda/fg/getMaterialByCode',
queryOrder: '/wmspda/material/outsourcing/into/queryOrder', queryOrder: '/wmspda/material/outsourcing/into/queryOrder',
querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo',
subcDnInfo: '/wmspda/material/orderin/subcDnInfo', subcDnInfo: '/wmspda/material/orderin/subcDnInfo',
submit: '/wmspda/material/outsourcing/into/materialComplete', submit: '/wmspda/material/outsourcing/into/materialComplete',
materialComplete: '/wmspda/material/outsourcing/materialComplete', materialComplete: '/wmspda/material/outsourcing/materialComplete',

@ -8,34 +8,18 @@
"moduleResolution": "node", "moduleResolution": "node",
"esModuleInterop": true, "esModuleInterop": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"experimentalDecorators":true, "experimentalDecorators": true,
"sourceMap": true, "sourceMap": true,
"skipLibCheck": true, "skipLibCheck": true,
"baseUrl": ".", "baseUrl": ".",
// 使typescriptvuereactnodeJSX "any" "JSX.Element" // 使typescriptvuereactnodeJSX "any" "JSX.Element"
"suppressImplicitAnyIndexErrors": true, "suppressImplicitAnyIndexErrors": true,
"noImplicitAny": false, // any "noImplicitAny": false, // any
"types": [ "types": ["webpack-env", "@dcloudio/types", "miniprogram-api-typings", "mini-types"],
"webpack-env",
"@dcloudio/types",
"miniprogram-api-typings",
"mini-types",
],
"paths": { "paths": {
"@/*": [ "@/*": ["./src/*"]
"./src/*"
]
}, },
"lib": [ "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
"esnext",
"dom",
"dom.iterable",
"scripthost"
]
}, },
"exclude": [ "exclude": ["node_modules", "unpackage", "src/**/*.nvue"]
"node_modules",
"unpackage",
"src/**/*.nvue"
]
} }

Loading…
Cancel
Save