修改 请求url

master
hou 4 years ago
parent ee1ccd300b
commit 0ce807b0c8

@ -99,6 +99,7 @@ export default {
dn_Tip: "实际收货数量不能大于需求数量", dn_Tip: "实际收货数量不能大于需求数量",
dn_Tip2: "实际退货数量不能大于需求数量", dn_Tip2: "实际退货数量不能大于需求数量",
dn_Tip3: "实际收货数量小于需求数量", dn_Tip3: "实际收货数量小于需求数量",
Line: "行项目",
//交接菜单页 //交接菜单页
Handover: "交接", Handover: "交接",
Picking: "拣配", Picking: "拣配",
@ -114,6 +115,7 @@ export default {
Pi_materielNo: "物料号", Pi_materielNo: "物料号",
Pi_order: "订单查询", Pi_order: "订单查询",
Query: "查询", Query: "查询",
time: "请先选择时间",
Pi_InputMrp: "请输入MRP", Pi_InputMrp: "请输入MRP",
Pi_InputFactory: "请输入工厂代码", Pi_InputFactory: "请输入工厂代码",
Pi_OrderNoNotSelected: "未选中订单号", Pi_OrderNoNotSelected: "未选中订单号",
@ -161,6 +163,7 @@ export default {
Summary_Number: "数量", Summary_Number: "数量",
Summary_Receiver: "接收人", Summary_Receiver: "接收人",
Summary_Password: "口令", Summary_Password: "口令",
screen: "筛选",
Summary_PleaseInputNumber: "请输入数量", Summary_PleaseInputNumber: "请输入数量",
Summary_PleaseInputReceiver: "请输入接收人", Summary_PleaseInputReceiver: "请输入接收人",
Summary_PleaseInputPassword: "请输入口令", Summary_PleaseInputPassword: "请输入口令",
@ -244,9 +247,9 @@ export default {
Warehouse_OriginalLocation: "原库位", Warehouse_OriginalLocation: "原库位",
Warehouse_TargetLocation: "目标库位", Warehouse_TargetLocation: "目标库位",
Warehouse_Tip: "请输入移库单号", Warehouse_Tip: "请输入移库单号",
transfer_barcode:'移库批次', transfer_barcode: "移库批次",
Product_code:'产品编码', Product_code: "产品编码",
Access_type:'出入类型', Access_type: "出入类型",
//报废 //报废
Scrap_ScrapNo: "报废单号", Scrap_ScrapNo: "报废单号",
@ -270,6 +273,7 @@ export default {
DumpListFHMX: "转储单发货明细", DumpListFHMX: "转储单发货明细",
DumpListSH: "转储单收货", DumpListSH: "转储单收货",
DumpListSHMX: "转储单收货明细", DumpListSHMX: "转储单收货明细",
deliver: "DN发货",
//成品入库主菜单 //成品入库主菜单
product_item1: "成品下线", product_item1: "成品下线",

@ -282,6 +282,10 @@ export default {
DumpListFHMX: "SFG delivery detail", DumpListFHMX: "SFG delivery detail",
DumpListSH: "SFG receive", DumpListSH: "SFG receive",
DumpListSHMX: "SFG receive detail", DumpListSHMX: "SFG receive detail",
deliver: "DN deliver goods",
Line: "rowItem",
screen: "screen",
time: "Please select the time first",
//成品入库主菜单 //成品入库主菜单
product_item1: "FG inward", product_item1: "FG inward",
product_item2: "Transfer vehicle offline", product_item2: "Transfer vehicle offline",

@ -481,6 +481,14 @@
"navigationBarTextStyle": "white" // white-black- "navigationBarTextStyle": "white" // white-black-
} }
}, },
{
"path": "pages/raw/handover/returning/Time-filter",
"style": {
"navigationBarTitleText": "筛选",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{ {
"path": "pages/raw/appointment/checkin/list", "path": "pages/raw/appointment/checkin/list",
"style": { "style": {

@ -7,7 +7,7 @@
<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.dn_ReceivingGoods") }}</view> <view class="title">{{ $t("message.deliver") }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<u-form <u-form
@ -19,64 +19,64 @@
> >
<u-form-item <u-form-item
:required="true" :required="true"
:label="this.$t('message.product_STONumber')" :label="$t('message.dn_OddNumbers')"
prop="orderNo" prop="orderNo"
> >
<u-search <u-search
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.Commission_tips1')"
v-model="form.orderNo" v-model="form.orderNo"
@search="model.queryOrderInInfo" @search="model.findProdInfoByDN"
:show-action="false" :show-action="false"
></u-search> ></u-search>
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_TotalNumber')"> <u-form-item :label="$t('message.product_TotalNumber')">
<u-input <u-input
v-model="model.orderInInfo.stoAmount" v-model="model.orderInInfo.stoAmount"
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
/> />
</u-form-item> </u-form-item>
<u-form-item :required="true" :label="this.$t('message.product_FGCode')"> <u-form-item :required="true" :label="$t('message.product_FGCode')">
<u-input <u-input
v-model="form.productCode" v-model="form.productCode"
type="select" type="select"
@click="materialCodeSelect = true" @click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
/> />
<u-select <u-select
:confirm-text="this.$t('message.product_Confirm')" :confirm-text="$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')" :cancel-text="$t('message.product_Cancel')"
v-model="materialCodeSelect" v-model="materialCodeSelect"
:list="model.materielList" :list="model.materielList"
@confirm="materialConfirm" @confirm="materialConfirm"
></u-select> ></u-select>
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_FGDes')"> <u-form-item :label="$t('message.product_FGDes')">
<u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
</u-form-item>
<u-form-item :label="$t('message.Line')">
<u-input :disabled="true" v-model="form.productDescZh" placeholder="" /> <u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
</u-form-item> </u-form-item>
<u-row gutter="0"> <u-row gutter="0">
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="this.$t('message.product_MaterilTotalNumber')"> <u-form-item :label="$t('message.product_MaterilTotalNumber')">
<u-input <u-input
v-model="form.orderAmount" v-model="form.orderAmount"
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
/> />
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col :span="6"> <u-col :span="6">
<u-form-item <u-form-item :label="$t('message.product_Swept')" label-width="80rpx">
:label="this.$t('message.product_Swept')"
label-width="80rpx"
>
<u-input <u-input
v-model="form.scanAmount" v-model="form.scanAmount"
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
/> />
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-form-item :label="this.$t('message.product_BarCode')"> <u-form-item :label="$t('message.product_BarCode')">
<u-search <u-search
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
v-model="form.barCode" v-model="form.barCode"
@search="onSubmit" @search="onSubmit"
:focus="firstFocus" :focus="firstFocus"
@ -105,7 +105,7 @@
<u-button <u-button
type="warning" type="warning"
@click="toPage(page.product.outbound.stoOutboundDetail)" @click="toPage(page.product.outbound.stoOutboundDetail)"
>{{ $t("message.product_PickingDetails") }}</u-button >{{ $t("message.detailed") }}</u-button
> >
</u-col> </u-col>
<u-col :span="4"> <u-col :span="4">
@ -168,7 +168,7 @@ export default class stoOutboundDom extends BasePage {
orderAmount: "", orderAmount: "",
productCode: "", // name productCode: "", // name
productDescZh: "", productDescZh: "",
scanAmount: "", scanAmount: 0,
barCode: "", barCode: "",
}; };
materialList: any = []; // materialList: any = []; //
@ -216,12 +216,22 @@ export default class stoOutboundDom extends BasePage {
materialConfirm(v: any) { materialConfirm(v: any) {
console.log("v[0].value", v[0]); console.log("v[0].value", v[0]);
// this.form.productCode = v[0].value; // this.form.productCode = v[0].value;
// this.model.materielList.forEach((item: any) => {
// if (v[0].value == item.stoItem) {
// this.form.productCode = item.materialCode;
// this.form.productDescZh = item.materialDesc;
// this.form.orderAmount = item.orderAmount;
// this.form.scanAmount = item.scanAmount;
// return;
// }
// });
this.model.materielList.forEach((item: any) => { this.model.materielList.forEach((item: any) => {
if (v[0].value == item.stoItem) { if (v[0].label == item.materialCode) {
this.form.productCode = item.materialCode; this.form.productCode = item.materialCode;
this.form.productDescZh = item.materialDesc; this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount; this.form.orderAmount = item.orderAmount;
this.form.scanAmount = item.scanAmount; this.form.scanAmount = parseFloat(item.scanAmount);
return;
} }
}); });
console.log("this.form", this.form); console.log("this.form", this.form);
@ -246,36 +256,43 @@ export default class stoOutboundDom extends BasePage {
onSubmit() { onSubmit() {
this.$form.validate(async (valid: boolean) => { this.$form.validate(async (valid: boolean) => {
if (this.form.productCode.slice(0, 9) != this.form.barCode.slice(0, 9)) { // if (this.form.productCode.slice(0, 9) != this.form.barCode.slice(0, 9)) {
uni.showToast({ // uni.showToast({
icon: "none", // icon: "none",
title: this.$t("message.product_Tip5") as string, // title: this.$t("message.product_Tip5") as string,
}); // });
return; // return;
} // }
if (parseInt(this.form.orderAmount) <= parseInt(this.form.scanAmount)) { if (parseInt(this.form.orderAmount) <= this.form.scanAmount) {
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: this.$t("message.product_Tip6") as string, title: this.$t("message.product_Tip6") as string,
}); });
return; return;
} }
let list = [ // let list = [
{ // {
order3: this.form.orderNo, // order3: this.form.orderNo,
productCode: this.form.productCode, // productCode: this.form.productCode,
productDescZh: this.form.productDescZh, // productDescZh: this.form.productDescZh,
barCode: this.form.barCode, // barCode: this.form.barCode,
dockCode: this.form.dockCode, // dockCode: this.form.dockCode,
dockName: this.form.dockName, // dockName: this.form.dockName,
orderType: 3, // // orderType: 3,
type: 0, // orderType: 4,
keepBy: session.loginName as string, // type: 0,
loginName: session.loginName as string, // keepBy: session.loginName as string,
}, // loginName: session.loginName as string,
]; // },
// ];
if (valid) { if (valid) {
const res = await this.model.tluSubmit(list); let list: any = {
productCode: this.form.productCode,
barcode: this.form.barCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
};
const res = await this.model.getMaterialByCode(list);
console.log("fanhui ", res); console.log("fanhui ", res);
// if (res.barcode) { // if (res.barcode) {
// // this.materialList.push(res); // // this.materialList.push(res);
@ -332,7 +349,8 @@ export default class stoOutboundDom extends BasePage {
keepBy: session.loginName, keepBy: session.loginName,
loginName: session.loginName, loginName: session.loginName,
order3: this.form.orderNo, order3: this.form.orderNo,
orderType: 3, // orderType: 3,
orderType: 4,
type: 0, type: 0,
productCode: item.productCode, productCode: item.productCode,
productDescZh: item.productDescZh, productDescZh: item.productDescZh,
@ -343,7 +361,7 @@ export default class stoOutboundDom extends BasePage {
regionCode: item.regionCode, regionCode: item.regionCode,
}; };
}); });
await this.model.confirm(selctlist); await this.model.confirmMove(selctlist);
// this.$form.resetFields(); // this.$form.resetFields();
// // this.form.barCode = ''; // // this.form.barCode = '';
// this.selectMaterielList = []; // this.selectMaterielList = [];
@ -358,7 +376,7 @@ export default class stoOutboundDom extends BasePage {
this.form.barCode = ""; this.form.barCode = "";
this.form.productCode = ""; this.form.productCode = "";
// this.form.orderNo = null; // this.form.orderNo = null;
this.form.scanAmount = ""; this.form.scanAmount = 0;
this.form.orderAmount = ""; this.form.orderAmount = "";
this.form.productDescZh = ""; this.form.productDescZh = "";
this.selectMaterielList = []; this.selectMaterielList = [];
@ -428,7 +446,7 @@ export default class stoOutboundDom extends BasePage {
padding: 20rpx; padding: 20rpx;
} }
.button-bar { // .button-bar {
} // }
} }
</style> </style>

@ -1,8 +1,14 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import {
import store from '@/store'; Action,
import http from '@/utils/request'; getModule,
import { url } from '@/utils/url'; Module,
import { session } from '@/store/modules/session'; MutationAction,
VuexModule,
} from "vuex-module-decorators";
import store from "@/store";
import http from "@/utils/request";
import { url } from "@/utils/url";
import { session } from "@/store/modules/session";
// import vm from '@/main'; // import vm from '@/main';
class OrderInInfo { class OrderInInfo {
@ -17,7 +23,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.outbound.stoOutbound', name: "product.outbound.stoOutbound",
}) })
export class ReturningModule extends VuexModule { export class ReturningModule extends VuexModule {
/** /**
@ -36,7 +42,7 @@ export class ReturningModule extends VuexModule {
*/ */
orderInInfo: OrderInInfo = new OrderInInfo(); orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码 //记账按钮的code码
code = ''; code = "";
/** /**
* *
*/ */
@ -59,9 +65,9 @@ export class ReturningModule extends VuexModule {
* @param orderNo * @param orderNo
*/ */
@MutationAction @MutationAction
async queryOrderInInfo(stoNo: string) { async queryOrderInInfo(nxOutCode: string) {
const result = await http.post(url.outbound.stoOutbound.info, { const result = await http.post(url.outbound.stoOutbound.info, {
stoNo, nxOutCode,
deleteFlag: 2, deleteFlag: 2,
finalState: 3, finalState: 3,
loginName: session.loginName, loginName: session.loginName,
@ -75,13 +81,40 @@ export class ReturningModule extends VuexModule {
value: item.stoItem, value: item.stoItem,
...item, ...item,
})); }));
console.log('materielList', materielList); console.log("materielList", materielList);
if (result.data.records[0]) { if (result.data.records[0]) {
result.data.records[0].stoAmount = stoAmount; result.data.records[0].stoAmount = stoAmount;
} }
const orderInInfo = result.data.records[0] || {}; const orderInInfo = result.data.records[0] || {};
return { orderInInfo, materielList }; return { orderInInfo, materielList };
} }
/**
*
* @param nxOutCode
*/
@MutationAction
async findProdInfoByDN(nxOutCode: string) {
const result = await http.post(url.outbound.stoOutbound.findProdInfoByDN, {
nxOutCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
let stoAmount = 0;
result.data.forEach((item: any) => {
stoAmount += item.orderAmount;
});
const materielList = result.data.map((item: any) => ({
label: item.materialCode,
value: item.stoItem,
...item,
}));
console.log("materielList", materielList);
if (result.data[0]) {
result.data[0].stoAmount = stoAmount;
}
const orderInInfo = result.data[0] || {};
return { orderInInfo, materielList };
}
/** /**
* *
@ -93,12 +126,28 @@ export class ReturningModule extends VuexModule {
loginName: session.loginName, loginName: session.loginName,
}; };
let oneMaterielDetail: any = {}; let oneMaterielDetail: any = {};
const { data }: any = await http.post(url.outbound.stoOutbound.checkScan, obj); const { data }: any = await http.post(
console.log('shneme a ', data.records); url.outbound.stoOutbound.checkScan,
obj
);
console.log("shneme a ", data.records);
oneMaterielDetail = data.records[0]; oneMaterielDetail = data.records[0];
data.records[0].materialCode = list[0].productCode; data.records[0].materialCode = list[0].productCode;
data.records[0].materialDesc = list[0].productDescZh; data.records[0].materialDesc = list[0].productDescZh;
console.log('aaaaa', oneMaterielDetail); 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; return oneMaterielDetail;
} }
/** /**
@ -107,8 +156,30 @@ export class ReturningModule extends VuexModule {
*/ */
@MutationAction @MutationAction
async confirm(list: any[]) { async confirm(list: any[]) {
const { code, data } = await http.post(url.outbound.stoOutbound.Bookkeeping, list); const { code, data } = await http.post(
console.log('res数据', data, code); 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 { code, data } = await http.post(
url.outbound.stoOutbound.Bookkeeping,
list
);
console.log("res数据", data, code);
// if (code == '1') { // if (code == '1') {
// uni.showToast({ icon: 'success', title: msg }); // uni.showToast({ icon: 'success', title: msg });
// } else { // } else {

@ -1,14 +1,21 @@
<template> <template>
<view class="page-product-receipt"> <view class="page-product-receipt">
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"> <view
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.Inventory') }}</view> <view class="title">{{ $t("message.Inventory") }}</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 :required="true" :label="this.$t('message.Warehouse_OrderNo')" prop="pddNo"> <u-form-item
:required="true"
:label="this.$t('message.Warehouse_OrderNo')"
prop="pddNo"
>
<u-search <u-search
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="this.$t('message.po_PleaseInput')"
v-model="form.pddNo" v-model="form.pddNo"
@ -38,16 +45,29 @@
/> />
</u-form-item> </u-form-item>
<u-form-item :label="this.$t('message.product_Location')"> <u-form-item :label="this.$t('message.product_Location')">
<u-input v-model="form.originWl.locCode" :placeholder="this.$t('message.po_PleaseInput')" /> <u-input
v-model="form.originWl.locCode"
:placeholder="this.$t('message.po_PleaseInput')"
/>
</u-form-item> </u-form-item>
<u-row> <u-row>
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="this.$t('message.product_Swept')" label-width="80rpx"> <u-form-item
<u-input :disabled="true" v-model="form.originWl.spQty" placeholder="" /> :label="this.$t('message.product_Swept')"
label-width="80rpx"
>
<u-input
:disabled="true"
v-model="form.originWl.spQty"
placeholder=""
/>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="this.$t('message.Warehouse_TotalNumber')" label-width="80rpx"> <u-form-item
:label="this.$t('message.Warehouse_TotalNumber')"
label-width="80rpx"
>
<u-input <u-input
v-model="form.originWl.ypQty" v-model="form.originWl.ypQty"
:placeholder="this.$t('message.po_PleaseInput')" :placeholder="this.$t('message.po_PleaseInput')"
@ -67,11 +87,13 @@
<view class="bottom-bar"> <view class="bottom-bar">
<u-row class="button-bar"> <u-row class="button-bar">
<u-col :span="6"> <u-col :span="6">
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button> <u-button type="primary" @click="onSubmit">{{
$t("message.workArea_Confirm")
}}</u-button>
</u-col> </u-col>
<u-col :span="6"> <u-col :span="6">
<u-button type="error" @click="uni.navigateBack()">{{ <u-button type="error" @click="uni.navigateBack()">{{
$t('message.po_Return') $t("message.po_Return")
}}</u-button> }}</u-button>
</u-col> </u-col>
</u-row> </u-row>
@ -80,11 +102,11 @@
</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 { 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;
@ -102,7 +124,7 @@ export default class productCheckReceipt extends BasePage {
/** /**
* 表单引用 * 表单引用
*/ */
@Ref('form') readonly $form!: VForm; @Ref("form") readonly $form!: VForm;
/** /**
* 页面Module * 页面Module
@ -114,16 +136,18 @@ export default class productCheckReceipt extends BasePage {
*/ */
form = { form = {
originWl: {} as OptionType, originWl: {} as OptionType,
pddNo: '', pddNo: "",
code: '', code: "",
pdMode: '', pdMode: "",
}; };
originWlSelect = false; originWlSelect = false;
aimWlSelect = false; aimWlSelect = false;
cboPlaceSelect = false; cboPlaceSelect = false;
rules: VFormRules<any> = { rules: VFormRules<any> = {
originWl: [{ required: true, message: this.$t('message.Warehouse_Tip2') as string }], originWl: [
{ required: true, message: this.$t("message.Warehouse_Tip2") as string },
],
}; };
show = false; show = false;
// onReadyonLoad // onReadyonLoad
@ -134,7 +158,7 @@ export default class productCheckReceipt extends BasePage {
// console.log('', this.model.WlList); // console.log('', this.model.WlList);
} }
onchange(e: any) { onchange(e: any) {
console.log('value', e); console.log("value", e);
//locCode //locCode
// this.form.originWl = e[0]; // this.form.originWl = e[0];
this.model.WlListaa.forEach((item: any) => { this.model.WlListaa.forEach((item: any) => {
@ -146,15 +170,15 @@ export default class productCheckReceipt extends BasePage {
async scanCode(e: any) { async scanCode(e: any) {
if (!this.form.pddNo) { if (!this.form.pddNo) {
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.originWl.productCode) { if (!this.form.originWl.productCode) {
uni.showToast({ uni.showToast({
icon: 'none', icon: "none",
title: this.$t('message.Warehouse_Tip6') as string, title: this.$t("message.Warehouse_Tip6") as string,
}); });
return; return;
} }
@ -174,7 +198,7 @@ export default class productCheckReceipt extends BasePage {
qty: 1, qty: 1,
}; };
await this.model.toScanCode(list); await this.model.toScanCode(list);
if (this.model.records.code == '1') { if (this.model.records.code == "1") {
this.form.originWl.spQty += 1; this.form.originWl.spQty += 1;
} }
} }
@ -183,15 +207,15 @@ export default class productCheckReceipt extends BasePage {
if (!valid) return; if (!valid) return;
if (!this.form.pddNo) { if (!this.form.pddNo) {
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.originWl.productCode) { if (!this.form.originWl.productCode) {
uni.showToast({ uni.showToast({
icon: 'none', icon: "none",
title: this.$t('message.Warehouse_Tip6') as string, title: this.$t("message.Warehouse_Tip6") as string,
}); });
return; return;
} }
@ -219,10 +243,10 @@ export default class productCheckReceipt extends BasePage {
this.commit(); this.commit();
} else { } else {
uni.showModal({ uni.showModal({
title: 'Tip', title: "Tip",
content: this.$t('message.Warehouse_Tip7') as string, content: this.$t("message.Warehouse_Tip7") as string,
confirmText: this.$t('message.workArea_Confirm') as string, confirmText: this.$t("message.workArea_Confirm") as string,
cancelText: this.$t('message.Cancel') as string, cancelText: this.$t("message.Cancel") as string,
showCancel: true, showCancel: true,
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
@ -249,7 +273,7 @@ export default class productCheckReceipt extends BasePage {
sn: this.form.code, sn: this.form.code,
spQty: this.form.originWl.spQty, spQty: this.form.originWl.spQty,
}; };
console.log('orderlist', list); console.log("orderlist", list);
this.model.onTakeoutConfirm(list); this.model.onTakeoutConfirm(list);
} }
} }
@ -257,7 +281,8 @@ export default class productCheckReceipt extends BasePage {
<style lang="scss" scoped> <style lang="scss" scoped>
.page-product-receipt { .page-product-receipt {
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;
background-size: 100% 600rpx; background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx; padding: 118rpx 30rpx 162rpx;
min-height: 100%; min-height: 100%;

@ -0,0 +1,186 @@
<template>
<view class="page-raw-returning">
<view
class="header"
:style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }"
>
<view class="left">
<u-icon class="icon" name="arrow-left" @click="back" />
</view>
<view class="title">{{ $t("message.screen") }}</view>
<view class="right"></view>
</view>
<view style="display: flex">
<u-field
style="background: white; border-radius: 10rpx"
v-model="startMobile"
placeholder="请选择开始时间"
label="开始时间:"
>
</u-field>
<u-picker
v-model="startShow"
:params="startParams"
mode="time"
@confirm="startConfirm"
></u-picker>
<u-button @click="startShow = true" type="primary">选择</u-button>
</view>
<view style="display: flex; margin-top: 20rpx">
<u-field
style="background: white; border-radius: 10rpx"
v-model="endMobile"
placeholder="请选择结束时间"
label="结束时间:"
>
</u-field>
<u-picker
v-model="endShow"
:params="endParams"
mode="time"
@confirm="endConfirm"
></u-picker>
<u-button @click="endShow = true" type="primary">选择</u-button>
</view>
<view class="table-wrapper" style="margin-top: 10rpx">
<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>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="6">
<u-button type="primary" @click="onSubmit">{{
$t("message.Query")
}}</u-button>
</u-col>
<u-col :span="6">
<u-button type="error" @click="back">{{
$t("message.po_Return")
}}</u-button>
</u-col>
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component } from "vue-property-decorator";
import { BasePage } from "@/components/base/page";
import model from "./model";
import { headers } from "./config";
@Component({
components: {},
})
export default class returningDom extends BasePage {
model = model;
startShow = false;
endShow = false;
startMobile = "";
endMobile = "";
materialList = [];
startParams = {
year: true,
month: true,
day: true,
hour: false,
minute: false,
second: false,
};
endParams = {
year: true,
month: true,
day: true,
hour: false,
minute: false,
second: false,
};
headers = headers;
startConfirm(startParams: any) {
this.startMobile =
startParams.year + "-" + startParams.month + "-" + startParams.day;
}
endConfirm(endParams: any) {
this.endMobile =
endParams.year + "-" + endParams.month + "-" + endParams.day;
}
onCheck() {}
back() {
uni.navigateBack({ delta: 1 });
}
/**
* 上传
*/
async onSubmit() {
if (this.startMobile == "" || this.endMobile == "") {
uni.showToast({
icon: "none",
title: this.$t("message.time") as string,
});
return;
}
let time = {
requireDateMin: this.startMobile,
requireDateMax: this.endMobile,
};
await this.model.queryTimeInInfo(time);
}
}
</script>
<style lang="scss" scoped>
.page-raw-returning {
background: #f2f2f2
linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
height: 88rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
.bottom-bar {
position: fixed;
bottom: 0;
left: 0;
right: 0;
z-index: 99;
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
}
</style>

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

@ -34,6 +34,13 @@
@search="model.queryOrderInInfo" @search="model.queryOrderInInfo"
:show-action="false" :show-action="false"
></u-search> ></u-search>
<u-button
size="mini"
style="margin-left: 10rpx"
type="primary"
@click="screen"
>筛选</u-button
>
<!-- <jPicker <!-- <jPicker
sureColor="#ff0000" sureColor="#ff0000"
style="width: 230rpx" style="width: 230rpx"
@ -180,7 +187,6 @@ export default class returningDom extends BasePage {
* 页面Module * 页面Module
*/ */
model = model; model = model;
/** /**
* 表单数据 * 表单数据
*/ */
@ -228,6 +234,9 @@ export default class returningDom extends BasePage {
{ required: true, message: this.$t("message.return_Tip3") as string }, { required: true, message: this.$t("message.return_Tip3") as string },
], ],
}; };
screen() {
this.redirectTo(this.page.raw.handover.returning.filter);
}
LocationChoice(e: any) { LocationChoice(e: any) {
console.log("e>>>>>>>>>>>>>>>>>>>>>>>>", e); console.log("e>>>>>>>>>>>>>>>>>>>>>>>>", e);
this.form.wlCode = e.pickerName.label; this.form.wlCode = e.pickerName.label;

@ -78,7 +78,28 @@ export class ReturningModule extends VuexModule {
const orderInInfo = data[0] || {}; const orderInInfo = data[0] || {};
return { orderInInfo, materielList }; return { orderInInfo, materielList };
} }
//根据时间查询单号列表
@MutationAction
async queryTimeInInfo(time: any) {
this.materielList = [];
const { data }: any = await http.post(url.material.prdOrder.info, {
requireDateMin: time.requireDateMin,
requireDateMax: time.requireDateMax,
page: "1",
rows: "50",
loginName: session.loginName,
});
console.log("qqqqqqqqq", data);
const materielList = data.map((item: any) => ({
label: item.materialCode,
value: item.materialCode,
amount: item.amount,
wkposCode: item.wkposCode,
sendSpot: item.sendSpot,
}));
const orderInInfo = data[0] || {};
return { orderInInfo, materielList };
}
/** /**
* *
*/ */

@ -149,7 +149,7 @@ export default class rawMaterialInventory extends BasePage {
// onReadyonLoad // onReadyonLoad
onReady() { onReady() {
this.$form.setRules(this.rules); this.$form.setRules(this.rules);
this.model.queryLocation(); //this.model.queryLocation();
// //
this.$form.resetFields(); this.$form.resetFields();
this.model.orderInInfo.carNo = ""; this.model.orderInInfo.carNo = "";

@ -15,6 +15,7 @@
/* 颜色变量 */ /* 颜色变量 */
/* 行为相关颜色 */ /* 行为相关颜色 */
@import 'uview-ui/theme.scss';
$uni-color-primary: #007aff; $uni-color-primary: #007aff;
$uni-color-success: #4cd964; $uni-color-success: #4cd964;
$uni-color-warning: #f0ad4e; $uni-color-warning: #f0ad4e;

@ -85,6 +85,7 @@ export const page = {
}, },
returning: { returning: {
index: "/pages/raw/handover/returning/index", index: "/pages/raw/handover/returning/index",
filter: "/pages/raw/handover/returning/Time-filter",
}, },
aggregating: { aggregating: {
index: "/pages/raw/handover/aggregating/index", index: "/pages/raw/handover/aggregating/index",

@ -17,172 +17,174 @@ export const url = {
}, },
sys: { sys: {
log: { log: {
error: "/sys/log/error", error: "/wmspda/sys/log/error",
}, },
}, },
auth: { auth: {
locations: "/auth/locations", locations: "/wmspda/auth/locations",
query: { query: {
location: "/auth/query/location", location: "/wmspda/auth/query/location",
location1: "/material/orderin/receiveloc", location1: "/wmspda/material/orderin/receiveloc",
}, },
systime: "/auth/systime", systime: "/wmspda/auth/systime",
userInfo: "/auth/userinfo", userInfo: "/wmspda/auth/userinfo",
pwd: { pwd: {
check: "/auth/pwd/check", check: "/wmspda/auth/pwd/check",
}, },
factory: { factory: {
sap: "/auth/factory/sap", sap: "/wmspda/auth/factory/sap",
}, },
}, },
appointmentreg: { appointmentreg: {
platform: { platform: {
list: "/appointmentreg/list/platform", list: "/wmspda/appointmentreg/list/platform",
}, },
kd: { kd: {
query: "/appointmentreg/query/kd", query: "/wmspda/appointmentreg/query/kd",
}, },
save: "/appointmentreg/save", save: "/wmspda/appointmentreg/save",
delay: { delay: {
list: "/appointmentreg/list/delay", list: "/wmspda/appointmentreg/list/delay",
}, },
leave: { leave: {
carInfo: "/appointmentreg/query/leave/carinfo", carInfo: "/wmspda/appointmentreg/query/leave/carinfo",
save: "/appointmentreg/leave/save", save: "/wmspda/appointmentreg/leave/save",
}, },
}, },
material: { material: {
POorderin: { POorderin: {
info: "/material/orderin/poInfo", info: "/wmspda/material/orderin/poInfo",
enter: "/material/orderin/enter", enter: "/wmspda/material/orderin/enter",
}, },
prdOrder: { prdOrder: {
info: "/material/comprehensive/detail/q", info: "/wmspda/material/comprehensive/detail/q",
}, },
DNorderin: { DNorderin: {
info: "/material/orderin/dnInfo", info: "/wmspda/material/orderin/dnInfo",
ImportInfo: "/material/orderin/overseasDnInfo", ImportInfo: "/wmspda/material/orderin/overseasDnInfo",
dnReturnInfo: "/material/orderin/dnReturnInfo", dnReturnInfo: "/wmspda/material/orderin/dnReturnInfo",
enter: "/material/orderin/enter", enter: "/wmspda/material/orderin/enter",
ImportEnter: "/material/orderin/overseasDnEnter", ImportEnter: "/wmspda/material/orderin/overseasDnEnter",
out: "/material/orderin/out", out: "/wmspda/material/orderin/out",
}, },
orderout: { orderout: {
take: "/material/orderout/take", take: "/wmspda/material/orderout/take",
detail: "/material/orderout/detail", detail: "/wmspda/material/orderout/detail",
unlock: "/material/orderout/unlock", unlock: "/wmspda/material/orderout/unlock",
takeout: "/material/orderout/takeout", takeout: "/wmspda/material/orderout/takeout",
}, },
// 原材料盘点 // 原材料盘点
rawMaterialInventory: { rawMaterialInventory: {
// 盘点单号查询检查 // 盘点单号查询检查
checkRaw: "/product/finished/checkRaw/order", checkRaw: "/wmspda/product/finished/checkRaw/order",
// 扫描物料号检查 // 扫描物料号检查
productCode: "/product/finished/checkRaw/productCode", productCode: "/wmspda/product/finished/checkRaw/productCode",
// 3.盘点单中不存在该物料但继续盘点,需要新增单号和物料信息 // 3.盘点单中不存在该物料但继续盘点,需要新增单号和物料信息
createInfo: "/product/finished/checkRaw/createInfo", createInfo: "/wmspda/product/finished/checkRaw/createInfo",
// 4.物料盘点确定 // 4.物料盘点确定
productComplete: "/product/finished/checkRaw/productComplete", productComplete: "/wmspda/product/finished/checkRaw/productComplete",
// 5.盘点完成 // 5.盘点完成
orderComplete: "/product/finished/checkRaw/orderComplete", orderComplete: "/wmspda/product/finished/checkRaw/orderComplete",
}, },
// 委外 commission // 委外 commission
commission: { commission: {
// 出库 goOut // 出库 goOut
goOut: { goOut: {
// 出库单号查询 // 出库单号查询
queryOrder: "/material/outsourcing/queryOrder", queryOrder: "/wmspda/material/outsourcing/queryOrder",
// 库位下拉列表 // 库位下拉列表
queryByFactoryCodeAndWorkAreaCode: queryByFactoryCodeAndWorkAreaCode:
"/wmspda/fg/queryByFactoryCodeAndWorkAreaCode", "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
// 出库提交 // 出库提交
materialComplete: "/material/outsourcing/materialComplete", materialComplete: "/wmspda/material/outsourcing/materialComplete",
// 出库明细查询 // 出库明细查询
outInfo: "/material/outsourcing/outInfo", outInfo: "/wmspda/material/outsourcing/outInfo",
}, },
entrant: { entrant: {
// 单号查询 // 单号查询
queryOrder: "/material/outsourcing/into/queryOrder", queryOrder: "/wmspda/material/outsourcing/into/queryOrder",
// 库位下拉列表 // 库位下拉列表
queryByFactoryCodeAndWorkAreaCode: queryByFactoryCodeAndWorkAreaCode:
"/wmspda/fg/queryByFactoryCodeAndWorkAreaCode", "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
// 提交 // 提交
materialComplete: "/material/outsourcing/into/materialComplete", materialComplete: "/wmspda/material/outsourcing/into/materialComplete",
// 明细查询 // 明细查询
info: "/material/outsourcing/into/info", info: "/wmspda/material/outsourcing/into/info",
}, },
}, },
}, },
SFG: { SFG: {
DumpListFH: { DumpListFH: {
FHDH: "/material/orderin/poEubInfo", FHDH: "/wmspda/material/orderin/poEubInfo",
enter: "/material/orderin/enterPoEub", enter: "/wmspda/material/orderin/enterPoEub",
}, },
}, },
//出库 //出库
outbound: { outbound: {
stoOutbound: { stoOutbound: {
info: "/material/orderout/queryStoPlan", info: "/wmspda/material/orderout/queryStoPlan",
findProdInfoByDN: "/wmspda/fg/findProdInfoByDN",
yuetaiType: "/wmspda/fg/queryDocksUnderWareHouse", yuetaiType: "/wmspda/fg/queryDocksUnderWareHouse",
Bookkeeping: "/wmspda/fg/confirmMove", Bookkeeping: "/wmspda/fg/confirmMove",
checkScan: "/wmspda/fg/getMaterialByCode", checkScan: "/wmspda/fg/getMaterialByCode",
queryOrder: "/material/outsourcing/into/queryOrder", getMaterialByCode: "/wmspda/fg/getMaterialByCode",
submit: "/material/outsourcing/into/materialComplete", queryOrder: "/wmspda/material/outsourcing/into/queryOrder",
materialComplete: "/material/outsourcing/materialComplete", submit: "/wmspda/material/outsourcing/into/materialComplete",
outsourcingQueryOrder: "/material/outsourcing/queryOrder", materialComplete: "/wmspda/material/outsourcing/materialComplete",
outsourcingQueryOrder: "/wmspda/material/outsourcing/queryOrder",
}, },
}, },
inbound: { inbound: {
finishProductOffline: { finishProductOffline: {
kuwei: "/wmspda/fg/getMdLocation", kuwei: "/wmspda/fg/getMdLocation",
barcode: "/product/finished/show-info", barcode: "/wmspda/product/finished/show-info",
confirm: "/product/finished/batch-offline", confirm: "/wmspda/product/finished/batch-offline",
}, },
semiFinishProductOfflineRefrigerator: { semiFinishProductOfflineRefrigerator: {
kuwei: "/wmspda/fg/getMdLocation", kuwei: "/wmspda/fg/getMdLocation",
materialCode: "/product/semi-finished/get-product", materialCode: "/wmspda/product/semi-finished/get-product",
confirm3: "/product/semi-finished/batch-online-turnover-door", //门体上线 confirm3: "/wmspda/product/semi-finished/batch-online-turnover-door", //门体上线
confirm2: "/product/semi-finished/batch-offline", //半成品空调/洗衣机下线 confirm2: "/wmspda/product/semi-finished/batch-offline", //半成品空调/洗衣机下线
confirm: "/product/semi-finished/batch-offline-turnover-car", //半成品冰箱下线 confirm: "/wmspda/product/semi-finished/batch-offline-turnover-car", //半成品冰箱下线
}, },
semiFinishProductOnlineBox: { semiFinishProductOnlineBox: {
materialCode: "/product/semi-finished/get-origin-material", materialCode: "/wmspda/product/semi-finished/get-origin-material",
}, },
}, },
sortscan: { sortscan: {
query: { query: {
prdorder: "/sortscan/query/prdorder", prdorder: "/wmspda/sortscan/query/prdorder",
prdorderList: "/sortscan/query/prdorder/list", prdorderList: "/wmspda/sortscan/query/prdorder/list",
aggregateList: "/sortscan/query/aggregate/list", aggregateList: "/wmspda/sortscan/query/aggregate/list",
}, },
save: { save: {
aggregate: "/sortscan/save/aggregate", aggregate: "/wmspda/sortscan/save/aggregate",
order: "/sortscan/save/order", order: "/wmspda/sortscan/save/order",
}, },
unlock: { unlock: {
list: "/sortscan/unlock/list", list: "/wmspda/sortscan/unlock/list",
}, },
lock: { lock: {
list: "/sortscan/lock/list", list: "/wmspda/sortscan/lock/list",
}, },
}, },
sumscan: { sumscan: {
query: { query: {
orderno: "/sumscan/query/orderno", orderno: "/wmspda/sumscan/query/orderno",
ordoutlist: "/sumscan/query/ordoutlist", ordoutlist: "/wmspda/sumscan/query/ordoutlist",
hzlist: "/sumscan/query/hzlist", hzlist: "/wmspda/sumscan/query/hzlist",
fllist: "/sumscan/query/fllist", fllist: "/wmspda/sumscan/query/fllist",
}, },
lock: { lock: {
list: "/sumscan/lock/list", list: "/wmspda/sumscan/lock/list",
}, },
unlock: { unlock: {
list: "sumscan/unlock/list", list: "/wmspdasumscan/unlock/list",
}, },
u: { u: {
order: "/sumscan/u/order", order: "/wmspda/sumscan/u/order",
hzlist: "/sumscan/u/hzlist", hzlist: "/wmspda/sumscan/u/hzlist",
fllist: "sumscan/u/fllist", fllist: "/wmspdasumscan/u/fllist",
}, },
}, },
warehouse: { warehouse: {
@ -208,30 +210,30 @@ export const url = {
}, },
}, },
bl: { bl: {
query: "/bl/query", query: "/wmspda/bl/query",
u: "/bl/u", u: "/wmspda/bl/u",
unlock: "/bl/unlock", unlock: "/wmspda/bl/unlock",
}, },
tl: { tl: {
get: { get: {
type: "/tl/get/type", type: "/wmspda/tl/get/type",
}, },
u: "/tl/u", u: "/wmspda/tl/u",
}, },
virtual: { virtual: {
query: { query: {
orderno: "/virtual/query/orderno", orderno: "/wmspda/virtual/query/orderno",
ordoutlist: "/virtual/query/ordoutlist", ordoutlist: "/wmspda/virtual/query/ordoutlist",
hzlist: "/virtual/query/hzlist", hzlist: "/wmspda/virtual/query/hzlist",
}, },
check: { check: {
amount: "/virtual/check/amount", amount: "/wmspda/virtual/check/amount",
}, },
unlock: { unlock: {
list: "/virtual/unlock/list", list: "/wmspda/virtual/unlock/list",
}, },
u: { u: {
hzlist: "/virtual/u/hzlist", hzlist: "/wmspda/virtual/u/hzlist",
}, },
}, },
}; };

@ -2,4 +2,5 @@ module.exports = {
lintOnSave: false, lintOnSave: false,
transpileDependencies: ['@dcloudio/uni-ui'], transpileDependencies: ['@dcloudio/uni-ui'],
assetsDir:'nwp/static', assetsDir:'nwp/static',
transpileDependencies: ['uview-ui']
} }
Loading…
Cancel
Save