Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

原材料移库页面重构 成品移库页面逻辑重构 其他

Browse Source
master
hou 4 years ago
parent f2e930064c
commit 76d8b727eb
8 changed files with 285 additions and 360 deletions
Show Stats Download Patch File Download Diff File

6
src/i18n/lang/cn.ts
Unescape Escape View File

@ -195,6 +195,7 @@ export default {
return_Tip4: '退料数量不能大于总数', return_Tip4: '退料数量不能大于总数',
quantitys: '不能大于应退货数量', quantitys: '不能大于应退货数量',
actual: '实际退货数量不等于应退货数量', actual: '实际退货数量不等于应退货数量',
greater: '不能大于总数',
receiveAStation: '接收工位', receiveAStation: '接收工位',
//库内主菜单 //库内主菜单
@ -205,7 +206,9 @@ export default {
Inventory: '成品盘点', Inventory: '成品盘点',
raw_Inventory: '原材料盘点', raw_Inventory: '原材料盘点',
Transfer: '移库码', Transfer: '移库码',
LibraryCode: '请生成移库码',
generate: '生成', generate: '生成',
TargetLocation: '请选择不同目标库位',
RowWarehouse: '原材料库内', RowWarehouse: '原材料库内',
SemiProductZC: '半成品转储', SemiProductZC: '半成品转储',
@ -237,6 +240,9 @@ export default {
// 委外-出库 // 委外-出库
CommissionGoOut: '委外出库', CommissionGoOut: '委外出库',
Outbound: '出库库位',
Warehousing: '入库库位',
PleaseQuantity: '请输入本次数量',
CommissionedGoOutDetails: '出库明细', CommissionedGoOutDetails: '出库明细',
CommissionedGoOutNumber: '出库数量', CommissionedGoOutNumber: '出库数量',
// 委外-提示 // 委外-提示

6
src/i18n/lang/en.ts
Unescape Escape View File

@ -228,12 +228,18 @@ export default {
CommissionedThisNumber: 'quantity', CommissionedThisNumber: 'quantity',
CommissionedNumber: 'Receipt quantity', CommissionedNumber: 'Receipt quantity',
CommissionedEntrantDetails: 'Warehousing', CommissionedEntrantDetails: 'Warehousing',
greater: 'Cannot be greater than total',
LibraryCode: 'Please change the library code',
CommissionedReceiptQuantity: 'Receipt quantity', CommissionedReceiptQuantity: 'Receipt quantity',
TargetLocation: 'Please select a different target location',
subcontract: 'subcontract', subcontract: 'subcontract',
// 委外-出库 // 委外-出库
CommissionGoOut: 'Subcontracting issue', CommissionGoOut: 'Subcontracting issue',
Outbound: 'Outbound location',
Warehousing: 'Warehousing location',
CommissionedGoOutDetails: 'Delivery details', CommissionedGoOutDetails: 'Delivery details',
PleaseQuantity: 'Please enter this quantity',
CommissionedGoOutNumber: 'Outbound quantity', CommissionedGoOutNumber: 'Outbound quantity',
// 委外-提示 // 委外-提示
Commission_tips1: 'Please enter the order No', Commission_tips1: 'Please enter the order No',

291
src/pages/product/warehouse/wholeTransfer/index.vue
Unescape Escape View File

@ -1,147 +1,72 @@
<template> <template>
<view class="page-product-receipt"> <view class="page-product-receipt">
<view <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
class="header"
:style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
>
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="back" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view> </view>
<view class="title">{{ $t("message.Relocation") }}</view> <view class="title">{{ $t('message.Relocation') }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-form class="form" ref="form" :model="form" label-width="180rpx"> <u-form class="form" ref="form" :model="form" label-width="180rpx">
<u-form-item :label="this.$t('message.Transfer')"> <!-- 移库码 -->
<u-input v-model="userDefined4" placeholder="" class="Transfer" /> <u-form-item :label="$t('message.Transfer')">
<u-button <u-input v-model="model.userDefined4" placeholder="" class="Transfer" />
type="primary" <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
style="height: 60rpx; margin-left: 20rpx"
@click="generate"
>{{ $t("message.generate") }}</u-button
>
</u-form-item> </u-form-item>
<u-form-item <!-- 条码 -->
:required="true" <u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
:label="this.$t('message.product_barCode')" <u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="query" :show-action="false"></u-search>
prop="productCode"
>
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.productCode"
@search="model.getProductCode"
:show-action="false"
></u-search>
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_FGCode')"> <!-- 成品编码 -->
<u-input <u-form-item :label="$t('message.product_FGCode')">
:disabled="true" <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
v-model="model.orderInInfo.productCode"
placeholder=""
/>
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_FGDes')"> <!-- 成品描述 -->
<u-input <u-form-item :label="$t('message.product_FGDes')">
:disabled="true" <u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" />
v-model="model.orderInInfo.productDescZh"
placeholder=""
/>
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_Number')"> <!-- 数量 -->
<u-input <u-form-item :label="$t('message.product_Number')">
:disabled="true" <u-input :disabled="true" v-model="model.orderInInfo.qty" placeholder="" />
v-model="model.orderInInfo.qty"
placeholder=""
/>
</u-form-item> </u-form-item>
<!-- <u-form-item label="类型:" prop="cboPlace"> <!-- 库位 -->
<u-input <u-form-item :label="$t('message.product_Location')">
v-model="model.orderInInfo.custCode" <u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
type="select"
@click="cboPlaceSelect = true"
/>
<u-select
v-model="cboPlaceSelect"
:list="model.modelType"
@confirm="(v) => (form.cboPlace = v[0])"
></u-select>
</u-form-item> -->
<!-- <u-form-item label="类型">
<u-input v-model="model.orderInInfo.custCodeName" />
</u-form-item> -->
<u-form-item :label="this.$t('message.product_Location')">
<u-input
:disabled="true"
v-model="model.orderInInfo.locCode"
placeholder=""
/>
</u-form-item> </u-form-item>
<!-- <u-form-item label="库位:" prop="originWl"> <!-- 目标库位 -->
<u-input v-model="form.originWl.label" type="select" @click="originWlSelect = true" /> <u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
<u-select <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
v-model="originWlSelect"
:list="model.WlList"
@confirm="(v) => (form.originWl = v[0])"
></u-select>
</u-form-item> -->
<!-- <u-form-item label="目标库位:" prop="aimWl">
<u-input v-model="form.aimWl.label" type="select" @click="aimWlSelect = true" />
<u-select
v-model="aimWlSelect"
:list="model.WlList"
@confirm="(v) => (form.aimWl = v[0])"
></u-select>
</u-form-item> -->
<u-form-item
:required="true"
:label="this.$t('message.Warehouse_TargetLocation')"
prop="aimWl"
>
<!-- <u-input v-model="form.aimWl.value" type="select" @click="aimWlSelect1 = true" /> -->
<jPicker
sureColor="#ff0000"
@bindpicker="bookTypeChange"
showKey="value"
valKey="value"
:val="form.aimWl.value"
:options="model.WlList"
/>
</u-form-item> </u-form-item>
</u-form> </u-form>
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
<!-- 移库明细 -->
<u-col :span="4"> <u-col :span="4">
<u-button type="primary" @click="bill">{{ <u-button type="primary" @click="bill">{{ $t('message.Warehouse_TransferDetails') }}</u-button>
$t("message.Warehouse_TransferDetails")
}}</u-button>
</u-col> </u-col>
<!-- 确定 -->
<u-col :span="4"> <u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ <u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
$t("message.workArea_Confirm")
}}</u-button>
</u-col> </u-col>
<!-- 返回 -->
<u-col :span="4"> <u-col :span="4">
<u-button type="error" @click="uni.navigateBack()">{{ <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
$t("message.po_Return")
}}</u-button>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Ref } from "vue-property-decorator"; import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from "@/components/base/page"; import { BasePage } from '@/components/base/page';
import jPicker from "@/components/J-Picker/jPicker.vue"; import jPicker from '@/components/J-Picker/jPicker.vue';
import { VForm, VFormRules } from "vue/types/form"; import { VForm, VFormRules } from 'vue/types/form';
import model from "./model"; import model from './model';
import { session } from "@/store/modules/session"; import { session } from '@/store/modules/session';
interface OptionType { interface OptionType {
label: string; label: string;
value: string; value: string;
} }
@Component({ @Component({
components: { components: {
jPicker, jPicker,
@ -151,149 +76,115 @@ export default class productCheckReceipt extends BasePage {
/** /**
* 表单引用 * 表单引用
*/ */
@Ref("form") readonly $form!: VForm; @Ref('form') readonly $form!: VForm;
/**
* 页面Module
*/
model = model; model = model;
/**
* 表单数据
*/
form = { form = {
// originWl: {} as OptionType,
aimWl: {} as OptionType, aimWl: {} as OptionType,
// qty: {} as OptionType, productCode: '',
productCode: "",
}; };
userDefined4: any = "";
// originWlSelect = false;
aimWlSelect = false; aimWlSelect = false;
// aimWlSelect1 = false;
cboPlaceSelect = false; cboPlaceSelect = false;
rules: VFormRules<any> = { rules: VFormRules<any> = {
documentNo: [ documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
{ required: true, message: this.$t("message.Warehouse_Tip1") as string },
],
// originWl: [{ required: true, message: '请选择库位地点' }], // originWl: [{ required: true, message: '请选择库位地点' }],
aimWl: [ aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
{ required: true, message: this.$t("message.Warehouse_Tip3") as string }, cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
],
cboPlace: [
{ required: true, message: this.$t("message.Warehouse_Tip4") as string },
],
}; };
back() { // back() {
uni.navigateBack({ delta: 1 }); // uni.navigateBack({ delta: 1 });
this.model.orderInInfo.productDescZh = ""; // }
} value = '';
value = "";
show = false; show = false;
//选择目标库位回调函数
bookTypeChange(e: any) { bookTypeChange(e: any) {
this.form.aimWl = e.pickerName; this.form.aimWl = e.pickerName;
} }
//扫描条码回车
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 async query() {
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.product_unit7') as string,
});
return;
}
await model.getProductCode(this.form.productCode);
if (model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.successful') as string,
});
}
}
//页面初始化
onReady() { onReady() {
this.model.orderInInfo.productDescZh = "";
this.model.orderInInfo.productCode = "";
this.model.orderInInfo.qty = "";
this.model.orderInInfo.locCode = "";
this.$form.setRules(this.rules); this.$form.setRules(this.rules);
this.model.queryLocation(); this.model.queryLocation();
} }
//点击生成随机移库码
async generate() { async generate() {
let person = JSON.parse( let person = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
);
let loginName = person.session.user.loginName; let loginName = person.session.user.loginName;
await this.model.getCpMoveBatchNo({ loginName }); await this.model.getCpMoveBatchNo({ loginName });
this.userDefined4 = model.userDefined4;
} }
//移库明细
async bill() { async bill() {
// if (this.form.documentNo == "") {
// uni.showToast({
// icon: "none",
// title: "请先输入要查询的单号" as any,
// });
// return;
// }
// let person = JSON.parse(
// localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
// );
// let content = {
// loginName: person.session.user.loginName,
// poNo: this.form.documentNo,
// factoryCode: person.session.user.factoryCode,
// };
// await this.model.querydetaildlist(content);
this.model.detailedList = []; this.model.detailedList = [];
this.redirectTo(this.page.product.warehouse.wholeTransfer.Local); this.redirectTo(this.page.product.warehouse.wholeTransfer.Local);
} }
//移库确认
onSubmit() { onSubmit() {
this.$form.validate((valid: boolean) => { this.$form.validate((valid: boolean) => {
if (!valid) return; if (!valid) return;
if (model.userDefined4 == ' ' || model.userDefined4.length == 0) {
uni.showToast({
icon: 'none',
title: this.$t('message.LibraryCode') as string,
});
return;
}
if (!this.form.productCode) { if (!this.form.productCode) {
uni.showToast({ uni.showToast({
icon: "none", icon: 'none',
title: this.$t("message.Warehouse_Tip5") as string, title: this.$t('message.Warehouse_Tip5') as string,
}); });
return; return;
} }
// if (!this.form.cboPlace.value) {
// uni.showToast({
// icon: 'none',
// title: '请选择类型!',
// });
// return;
// }
// if (!this.form.originWl.value) {
// uni.showToast({
// icon: 'none',
// title: '请选择库位!',
// });
// return;
// }
if (!this.form.aimWl.value) { if (!this.form.aimWl.value) {
uni.showToast({ uni.showToast({
icon: "none", icon: 'none',
title: this.$t("message.Warehouse_Tip3") as string, title: this.$t('message.Warehouse_Tip3') as string,
});
return;
}
if (this.form.aimWl.value == model.orderInInfo.locCode) {
uni.showToast({
icon: 'none',
title: this.$t('message.TargetLocation') as string,
}); });
return; return;
} }
console.log("orderlist");
const orderlist = [ const orderlist = [
{ {
...this.model.orderInInfo, ...this.model.orderInInfo,
originWl: this.model.orderInInfo.locCode, originWl: this.model.orderInInfo.locCode,
barCode: this.model.orderInInfo.barcode, barCode: this.model.orderInInfo.barcode,
aimWl: this.form.aimWl.value, aimWl: this.form.aimWl.value,
type: "0", type: '0',
orderType: "0", orderType: '0',
keepBy: session.loginName as string, keepBy: session.loginName as string,
factoryCode: session.factoryCode as string, factoryCode: session.factoryCode as string,
userDefined4: this.userDefined4, userDefined4: model.userDefined4,
}, },
]; ];
console.log("orderlist", orderlist);
this.model.onTakeoutConfirm(orderlist); this.model.onTakeoutConfirm(orderlist);
this.model.orderInInfo.productDescZh = "";
this.model.orderInInfo.productCode = "";
this.model.orderInInfo.qty = "";
this.model.orderInInfo.locCode = "";
this.form.productCode = "";
}); });
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page-product-receipt { .page-product-receipt {
background: #f2f2f2 background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx; background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx; padding: 118rpx 30rpx 162rpx;
min-height: 100%; min-height: 100%;

84
src/pages/product/warehouse/wholeTransfer/model.ts
Unescape Escape View File

@ -1,15 +1,9 @@
import { import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
Action, import store from '@/store';
getModule, import http from '@/utils/request';
Module, import { url } from '@/utils/url';
MutationAction, import { session } from '@/store/modules/session';
VuexModule, import vm from '@/main';
} 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";
// import { page } from '@/utils/page'; // import { page } from '@/utils/page';
class OrderInInfo { class OrderInInfo {
@ -26,16 +20,16 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: "product.warehouse.wholeTransfer", name: 'product.warehouse.wholeTransfer',
}) })
export class wholeTransfer extends VuexModule { export class wholeTransfer extends VuexModule {
/** /**
* 库位地点列表 * 库位地点列表
*/ */
WlList = []; WlList = [];
userDefined4 = ""; userDefined4 = '';
detailedList: any; detailedList: any;
code = '';
/** /**
* 物料型号类型 * 物料型号类型
*/ */
@ -48,7 +42,7 @@ export class wholeTransfer extends VuexModule {
/** /**
* 隐藏看单号 * 隐藏看单号
*/ */
dnNo = ""; dnNo = '';
/** /**
* 看单号查询结果 * 看单号查询结果
*/ */
@ -74,12 +68,10 @@ export class wholeTransfer extends VuexModule {
const result: any = await http.get(url.warehouse.wholeTransfer.list, { const result: any = await http.get(url.warehouse.wholeTransfer.list, {
params: { params: {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
// factoryCode: '1999',
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999',
}, },
}); });
console.log("库位数据", result); console.log('库位数据', result);
const WlList = result.data.map((_: any) => ({ const WlList = result.data.map((_: any) => ({
label: _.locationCode, label: _.locationCode,
value: _.locationCode, value: _.locationCode,
@ -97,34 +89,34 @@ export class wholeTransfer extends VuexModule {
const res: any = await http.post(url.warehouse.wholeTransfer.content, { const res: any = await http.post(url.warehouse.wholeTransfer.content, {
barcode, barcode,
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
// factoryCode: '1999',
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999',
}); });
console.log("获取来的数据", res.data.records); const code = res.code;
const orderInInfo = res.data.records[0]; const orderInInfo = res.data.records[0];
if (orderInInfo.custCode == "0") { if (orderInInfo.custCode == '0') {
orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any; orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any;
} else if (orderInInfo.custCode == "1") { } else if (orderInInfo.custCode == '1') {
orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any; orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any;
} else if (orderInInfo.custCode == "2") { } else if (orderInInfo.custCode == '2') {
orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any; orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any;
} else if (orderInInfo.custCode == "4") { } else if (orderInInfo.custCode == '4') {
orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any; orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any;
} }
return { orderInInfo, code };
}
//清除数据
@MutationAction
async empty() {
const orderInInfo: any = [];
return { orderInInfo }; return { orderInInfo };
} }
@MutationAction @MutationAction
async onTakeoutConfirm(list: any) { async onTakeoutConfirm(list: any) {
const records: any = await http.post( const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
url.warehouse.rowTransfer.commit,
list
);
if (records.code == 1) { if (records.code == 1) {
uni.showToast({ uni.showToast({
icon: "success", icon: 'success',
title: "success", title: 'success',
}); });
// uni.navigateTo({ url: page.product.warehouse.index }); // uni.navigateTo({ url: page.product.warehouse.index });
} }
@ -133,19 +125,15 @@ export class wholeTransfer extends VuexModule {
//生成移库码 //生成移库码
@MutationAction @MutationAction
async getCpMoveBatchNo(loginName: any) { async getCpMoveBatchNo(loginName: any) {
let res: any = await http.post( let res: any = await http.post(url.warehouse.rowTransfer.getCode, loginName);
url.warehouse.rowTransfer.getCode,
loginName
);
let userDefined4 = res.data; let userDefined4 = res.data;
this.userDefined4 = userDefined4;
return { userDefined4 }; return { userDefined4 };
} }
//查询明细 //查询明细
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: 'updateCheckedOrderInInfoListKw' })
async querydetaildlist(content: any) { async querydetaildlist(content: any) {
let res: any = await http.post("/wmspda/fg/queryListByBatchNo", content); let res: any = await http.post('/wmspda/fg/queryListByBatchNo', content);
console.log("明细》》》》》》》》》", res.list); console.log('明细》》》》》》》》》', res.list);
this.detailedList = res.data; this.detailedList = res.data;
return res; return res;
} }
@ -178,12 +166,12 @@ export class wholeTransfer extends VuexModule {
/** /**
* 修改库位 * 修改库位
*/ */
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: 'updateCheckedOrderInInfoListKw' })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post("/wmspda/material/orderin/enter", { await http.post('/wmspda/material/orderin/enter', {
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999', // loginName: '1999',
warehouseCode: "", warehouseCode: '',
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
// factoryCode: '1999', // factoryCode: '1999',
locationCode: kw, locationCode: kw,

12
src/pages/raw/warehouse/rowTransfer/config.ts
Unescape Escape View File

@ -5,30 +5,30 @@ import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.Warehouse_OrderNo'), label: vm.$t('message.Warehouse_OrderNo'),
key: 'orderNo', key: 'orderNo', //单号
// width: '15%', // width: '15%',
}, },
{ {
label: vm.$t('message.po_MaterielNo'), label: vm.$t('message.po_MaterielNo'),
key: 'productCode', key: 'productCode', //物料号
// width: '15%', // width: '15%',
}, },
{ {
label: vm.$t('message.po_MaterielDes'), label: vm.$t('message.po_MaterielDes'),
key: 'productDescZh', key: 'productDescZh', //物料描述
width: 350, width: 350,
}, },
{ {
label: vm.$t('message.dn_Number'), label: vm.$t('message.dn_Number'),
key: 'qty', key: 'qty', //数量
}, },
{ {
label: vm.$t('message.Warehouse_OriginalLocation'), label: vm.$t('message.Warehouse_OriginalLocation'),
key: 'originWl', key: 'originWl', //原库位
}, },
{ {
label: vm.$t('message.Warehouse_TargetLocation'), label: vm.$t('message.Warehouse_TargetLocation'),
key: 'aimWl', key: 'aimWl', //目标库位
}, },
// { // {
// label: '校验状态', // label: '校验状态',

49
src/pages/raw/warehouse/rowTransfer/details.vue
Unescape Escape View File

@ -1,25 +1,13 @@
<template> <template>
<view class="page-kan-dan-detail"> <view class="page-kan-dan-detail">
<view <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
class="header"
:style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
>
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view> </view>
<view class="title">{{ $t("message.Warehouse_TransferDetails") }}</view> <view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<wyb-table <wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="model.orderInInfoList" :show-vert-border="false" />
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="model.orderInInfoList"
:show-vert-border="false"
/>
<view class="bottom-bar"> <view class="bottom-bar">
<!-- <view class="extra"> <!-- <view class="extra">
<u-row> <u-row>
@ -42,14 +30,10 @@
<view class="container"> <view class="container">
<u-row> <u-row>
<u-col :span="6"> <u-col :span="6">
<u-button type="primary" @click="Confirm">{{ <u-button type="primary" @click="Confirm">{{ $t('message.dn_Confirm') }}</u-button>
$t("message.dn_Confirm")
}}</u-button>
</u-col> </u-col>
<u-col :span="6"> <u-col :span="6">
<u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ <u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
$t("message.po_Return")
}}</u-button>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
@ -58,18 +42,18 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component } from "vue-property-decorator"; import { Component } from 'vue-property-decorator';
import { BasePage } from "@/components/base/page"; import { BasePage } from '@/components/base/page';
import model from "./model"; import model from './model';
// import { order, OrderDetail } from '@/pages/raw/warehouse/transfer/model'; // import { order, OrderDetail } from '@/pages/raw/warehouse/transfer/model';
// import { auth } from '@/store/modules/auth'; // import { auth } from '@/store/modules/auth';
// import { pick, omit, cloneDeep } from 'lodash/fp'; // import { pick, omit, cloneDeep } from 'lodash/fp';
import { headers } from "./config"; import { headers } from './config';
import { session } from "@/store/modules/session"; import { session } from '@/store/modules/session';
@Component @Component
export default class KanDanHandOverDetails extends BasePage { export default class KanDanHandOverDetails extends BasePage {
order = ""; order = '';
headers = headers; headers = headers;
/** /**
@ -108,15 +92,15 @@ export default class KanDanHandOverDetails extends BasePage {
}); });
if (orderlist.length == 0) { if (orderlist.length == 0) {
uni.showToast({ uni.showToast({
icon: "none", icon: 'none',
title: "请先选中要移库的数据" as any, title: '请先选中要移库的数据' as any,
}); });
return; return;
} }
orderlist.forEach((item: any) => { orderlist.forEach((item: any) => {
item.type = "1"; item.type = '1';
item.keepBy = session.loginName; item.keepBy = session.loginName;
item.orderType = "0"; item.orderType = '0';
}); });
await model.onTakeoutConfirm(orderlist); await model.onTakeoutConfirm(orderlist);
setTimeout(() => { setTimeout(() => {
@ -128,8 +112,7 @@ export default class KanDanHandOverDetails extends BasePage {
<style lang="scss" scoped> <style lang="scss" scoped>
.page-kan-dan-detail { .page-kan-dan-detail {
background: #f2f2f2 background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx; background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx; padding: 118rpx 30rpx 162rpx;
min-height: 100%; min-height: 100%;

165
src/pages/raw/warehouse/rowTransfer/index.vue
Unescape Escape View File

@ -7,59 +7,65 @@
<view class="title">{{ $t('message.RowRelocation') }}</view> <view class="title">{{ $t('message.RowRelocation') }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-form class="form" label-width="130rpx"> <u-form class="form" ref="form" :error-type="['toast']" label-width="150rpx">
<view class="title">{{ $t('message.Warehouse_QueryCriteria') }}</view> <!-- 单号查询 -->
<u-form-item :required="true" :label="this.$t('message.Warehouse_OrderNo')"> <u-form-item :required="true" :label="$t('message.InventoryOrderNo')" prop="orderNo">
<u-input v-model="order3" :placeholder="this.$t('message.po_PleaseInput')" /> <u-search :placeholder="$t('message.Commission_tips1')" v-model="order3" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 物料号选择 -->
<u-form-item :required="true" :label="$t('message.CommissionedMaterielNo')">
<u-input v-model="orderlist.productCode" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.Warehouse_Tip6')" />
<u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
</u-form-item>
<!-- 物料描述 -->
<u-form-item :label="$t('message.po_MaterielDes')">
<u-input :disabled="true" v-model="orderlist.productDescZh" placeholder="" />
</u-form-item>
<!-- 出库库位 -->
<u-form-item :label="$t('message.Outbound')">
<u-input :disabled="true" v-model="orderlist.originWl" placeholder="" />
</u-form-item>
<!-- 入库库位 -->
<u-form-item :label="$t('message.Warehousing')">
<u-input :disabled="true" v-model="orderlist.aimWl" placeholder="" />
</u-form-item>
<!-- 总数 -->
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
<u-input :disabled="true" v-model="orderlist.qty" placeholder="" />
</u-form-item>
<!-- 本次数量 -->
<u-form-item :label="$t('message.CommissionedThisNumber')">
<u-input v-model="NEWqty" placeholder="" />
</u-form-item> </u-form-item>
<u-row class="button-bar">
<u-col :span="4">
<u-button type="error" @click="uni.navigateBack()">{{
$t('message.po_Return')
}}</u-button>
</u-col>
<u-col :span="8">
<u-button type="primary" @click="submit"
>{{ $t('message.po_Continue') }}
</u-button></u-col
>
</u-row>
</u-form> </u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<!-- 确定 -->
<u-col :span="6">
<u-button type="primary" @click="submit">{{ $t('message.product_Confirm') }}</u-button>
</u-col>
<!-- 返回 -->
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
</view>
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component } from 'vue-property-decorator'; import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page'; import { BasePage } from '@/components/base/page';
import model from './model'; import model from './model';
import { session } from '@/store/modules/session';
import { page } from '@/utils/page';
@Component @Component
export default class KanDanHandOver extends BasePage { export default class KanDanHandOver extends BasePage {
order3 = ''; order3 = '';
/** NEWqty = '';
* 页面Module
*/
model = model; model = model;
// async onKdOrderNoConfirm() { materialCodeSelect = false;
// if (this.order3 === '') { orderlist: any = [];
// uni.showToast({ icon: 'none', title: '请扫描看单号' }); //查询单号
// return; async query() {
// } else {
// try {
// const odr = await order.takeOrder({ order3: this.order3, page: 1, row: 50 });
// order.add({ order: odr });
// // uni.navigateTo({ url: page.raw.warehouse.transfer.details });
// } catch (e) {
// uni.showToast({ icon: 'none', title: e.message });
// }
// }
// }
// onReady() {
// this.model.takeOrder();
// }
async submit() {
if (this.order3 === '') { if (this.order3 === '') {
uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip') as string }); uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip') as string });
return; return;
@ -67,12 +73,58 @@ export default class KanDanHandOver extends BasePage {
await this.model.takeYKOrder({ await this.model.takeYKOrder({
order3: this.order3, order3: this.order3,
}); });
uni.navigateTo({ url: page.raw.warehouse.rowTransfer.details }); if (model.code == '1') {
uni.showToast({ icon: 'none', title: this.$t('message.successful') as string });
this.orderlist = model.materielList[0];
this.NEWqty = model.materielList[0].qty;
}
}
}
//选择物料回调函数
materialConfirm(v: any) {
this.orderlist.productCode = v[0].label;
model.materielList.forEach((item: any) => {
if (this.orderlist.productCode == item.productCode) {
this.orderlist = item;
this.NEWqty = item.qty;
}
});
}
//提交数据
async submit() {
if (this.order3 == '') {
uni.showToast({ icon: 'none', title: this.$t('message.InventoryPleaseScan') as string });
return;
}
if (this.orderlist.length == 0) {
uni.showToast({ icon: 'none', title: this.$t('message.Commission_tips6') as string });
return;
}
if (this.NEWqty == '' || parseFloat(this.NEWqty) == 0) {
uni.showToast({ icon: 'none', title: this.$t('message.PleaseQuantity') as string });
return;
}
if (parseFloat(this.NEWqty) > parseFloat(this.orderlist.qty)) {
uni.showToast({ icon: 'none', title: this.$t('message.greater') as string });
return;
}
this.orderlist.type = '1';
this.orderlist.keepBy = session.loginName;
this.orderlist.orderType = '0';
this.orderlist.qty = this.NEWqty;
let arr = [];
arr.push(this.orderlist);
await model.onTakeoutConfirm(arr);
if (model.code == '1') {
uni.showToast({ icon: 'none', title: this.$t('message.Warehouse_Tip9') as string });
model.empty();
setTimeout(() => {
this.toPage(this.page.raw.warehouse.rowTransfer.index);
}, 2000);
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.page-kan-dan-index { .page-kan-dan-index {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat; background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
@ -108,7 +160,6 @@ export default class KanDanHandOver extends BasePage {
height: 88rpx; height: 88rpx;
} }
} }
.form { .form {
background-color: #fff; background-color: #fff;
padding: 40rpx; padding: 40rpx;
@ -116,25 +167,19 @@ export default class KanDanHandOver extends BasePage {
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.u-form-item { .u-form-item {
padding: 30rpx 0;
line-height: 35rpx; line-height: 35rpx;
background-color: #f7f6fb;
padding: 10rpx 30rpx;
border-radius: 8rpx;
&:after {
border-bottom-width: 0;
} }
} }
.bottom-bar {
.title { position: fixed;
margin-bottom: 40rpx; bottom: 0;
color: #1a1a1a; left: 0;
font-size: 30rpx; right: 0;
font-weight: 500; z-index: 99;
} background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
.button-bar { padding: 20rpx;
margin: 40rpx -10rpx 0;
}
} }
} }
</style> </style>

28
src/pages/raw/warehouse/rowTransfer/model.ts
Unescape Escape View File

@ -37,6 +37,8 @@ export class rowTransfer extends VuexModule {
* 看单明细 * 看单明细
*/ */
orderInInfoList: OrderInInfo[] = []; orderInInfoList: OrderInInfo[] = [];
materielList = [];
code = '';
/** /**
* 看单明细未通过明细 * 看单明细未通过明细
*/ */
@ -58,9 +60,15 @@ export class rowTransfer extends VuexModule {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,
}); });
console.log('records', records);
const code = records.code;
const orderInInfoList = records.data.records; const orderInInfoList = records.data.records;
console.log('获取来的数据', orderInInfoList); const materielList = orderInInfoList.map((item: any) => ({
return { orderInInfoList }; label: item.productCode,
value: item.stoItem,
...item,
}));
return { orderInInfoList, materielList, code };
} catch { } catch {
uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any }); uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });
} }
@ -69,16 +77,14 @@ export class rowTransfer extends VuexModule {
@MutationAction @MutationAction
async onTakeoutConfirm(list: any) { async onTakeoutConfirm(list: any) {
const records: any = await http.post(url.warehouse.rowTransfer.commit, list); const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
if (records.code == 1) { const code = records.code;
uni.showToast({ return { code };
icon: 'success',
title: 'success',
});
// setTimeout(() => {
// uni.navigateTo({ url: page.raw.warehouse.rowTransfer.index });
// }, 2000);
} }
return {}; //清除数据
@MutationAction
async empty() {
const materielList = [];
return { materielList };
} }
} }

Write Preview
Loading…
Cancel
Save