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

收、入库页面接口绑定

Browse Source
master
zhoulei 4 years ago
parent 1779a0faf8
commit 2e9e10ce0e
11 changed files with 311 additions and 196 deletions
Show Stats Download Patch File Download Diff File

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

@ -213,6 +213,7 @@ export default {
CommissionedThisNumber:'本次数量', CommissionedThisNumber:'本次数量',
CommissionedNumber:'入库数量', CommissionedNumber:'入库数量',
CommissionedEntrantDetails:'入库明细', CommissionedEntrantDetails:'入库明细',
CommissionedReceiptQuantity:'收货数量',
// 委外-出库 // 委外-出库
CommissionGoOut:'委外出库', CommissionGoOut:'委外出库',

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

@ -215,11 +215,14 @@ export default {
CommissionedCumulativeData:'累计数据', CommissionedCumulativeData:'累计数据',
CommissionedLocation:'库位', CommissionedLocation:'库位',
CommissionedThisNumber:'本次数量', CommissionedThisNumber:'本次数量',
CommissionedNumber:'入库数量',
CommissionedEntrantDetails:'入库明细', CommissionedEntrantDetails:'入库明细',
CommissionedReceiptQuantity:'收货数量',
// 委外-出库 // 委外-出库
CommissionGoOut:'委外出库', CommissionGoOut:'委外出库',
CommissionedGoOutDetails:'出库明细', CommissionedGoOutDetails:'出库明细',
CommissionedGoOutNumber:'出库数量',
//移库 //移库
Warehouse_QueryCriteria: "Query criteria", Warehouse_QueryCriteria: "Query criteria",

29
src/pages/raw/commission/entrant/config.ts
Unescape Escape View File

@ -1,21 +1,40 @@
/*
* @Author: zhou lei
* @Date: 2021-11-10 17:14:44
* @LastEditTime: 2021-11-22 17:43:40
* @LastEditors: zhou lei
* @Description:
* @FilePath: /wms_haiwai_app/src/pages/raw/commission/entrant/config.ts
* 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
*/
/** /**
* 看单明细表格列 * 看单明细表格列
*/ */
import vm from '@/main'; import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.product_barCode'), label: vm.$t('message.CommissionedSingleNumber'),
key: 'barcode', key: 'poNo',
width: 300, width: 200,
}, },
{ {
label: vm.$t('message.product_FGCode'), label: vm.$t('message.po_MaterielNo'),
key: 'materialCode', key: 'materialCode',
width: 300, width: 300,
}, },
{ {
label: vm.$t('message.product_FGDes'), label: vm.$t('message.CommissionedMaterielDesc'),
key: 'materialDesc', key: 'materialDesc',
width: 300, width: 300,
}, },
{
label: vm.$t('message.CommissionedReceiptQuantity'),
key: 'amount',
width: 200,
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'wlCode',
width: 200,
}
]; ];

38
src/pages/raw/commission/entrant/detail.vue
Unescape Escape View File

@ -26,41 +26,8 @@
>{{ $t('message.po_Total') }} {{ model.materielList.length }} >{{ $t('message.po_Total') }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col {{ $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>
@ -72,7 +39,7 @@ import model from './model';
import { headers } from './config'; import { headers } from './config';
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawCommissionEntrantDetail extends BasePage {
/** /**
* 页面Module * 页面Module
*/ */
@ -87,6 +54,9 @@ export default class RawReceiptDetail extends BasePage {
* 表头 * 表头
*/ */
headers = headers; headers = headers;
onLoad(params:any){
this.model.info(params.poNo)
}
/** /**
* 逐条修改 * 逐条修改

244
src/pages/raw/commission/entrant/index.vue
Unescape Escape View File

@ -8,68 +8,63 @@
<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.CommissionedSingleNumber')" prop="orderNo"> <u-form-item :required="true" :label="$t('message.CommissionedSingleNumber')" prop="poNo">
<!-- 单号 -->
<u-search <u-search
:placeholder="$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
v-model="form.orderNo" v-model="form.poNo"
@search="model.queryOrderInInfo" @search="queryOrder"
:show-action="false" :show-action="false"
></u-search> ></u-search>
</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 :required="true" :label="$t('message.CommissionedMaterielNo')"> <u-form-item :label="$t('message.CommissionedMaterielNo')">
<u-input <u-input v-model="form.materialCode" :placeholder="$t('message.po_PleaseInput')" />
v-model="form.orderNo"
type="select"
@click="materialCodeSelect = true"
:placeholder="$t('message.po_PleaseInput')"
/>
<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>
</u-col> </u-col>
<!-- 物料描述 -->
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="$t('message.CommissionedMaterielDesc')"> <u-form-item :label="$t('message.CommissionedMaterielDesc')">
<u-input v-model="form.productCode" :placeholder="$t('message.po_PleaseInput')" /> <u-input v-model="form.materialDesc" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="0"> <u-row gutter="0">
<!-- 需求数量 -->
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="$t('message.CommissionedDemandData')"> <u-form-item :label="$t('message.CommissionedDemandData')">
<u-input v-model="form.productDescZh" :placeholder="$t('message.po_PleaseInput')" /> <u-input v-model="form.poAmount" :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 :label="$t('message.CommissionedCumulativeData')"> <u-form-item :label="$t('message.CommissionedCumulativeData')">
<u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" /> <u-input v-model="form.receiptAmount" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-row gutter="0"> <u-row gutter="0">
<!-- 库位 -->
<u-col :span="6"> <u-col :span="6">
<u-form-item :required="true" :label="$t('message.CommissionedLocation')"> <u-form-item :required="true" :label="$t('message.CommissionedLocation')">
<u-input <u-input
v-model="form.qty" v-model="form.locationCode"
type="select" type="select"
@click="materialCodeSelect = true" @click="locationCodeSelect = true"
:placeholder="$t('message.po_PleaseInput')" :placeholder="$t('message.po_PleaseInput')"
/> />
<u-select <u-select
:confirm-text="$t('message.product_Confirm')" :confirm-text="$t('message.product_Confirm')"
:cancel-text="$t('message.product_Cancel')" :cancel-text="$t('message.product_Cancel')"
v-model="materialCodeSelect" v-model="locationCodeSelect"
:list="model.materielList" :list="model.locationCodeList"
@confirm="materialConfirm" @confirm="locationCodeConfirm"
></u-select> ></u-select>
</u-form-item> </u-form-item>
</u-col> </u-col>
<!-- 本次数量 -->
<u-col :span="6"> <u-col :span="6">
<u-form-item :label="$t('message.CommissionedThisNumber')"> <u-form-item :label="$t('message.CommissionedThisNumber')">
<u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" /> <u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
@ -86,13 +81,13 @@
<view class="table-wrapper"> <view class="table-wrapper">
<u-table class="library-table"> <u-table class="library-table">
<u-tr class="u-tr"> <u-tr class="u-tr">
<u-th class="u-th">{{ $t("message.po_MaterielNo") }}</u-th> <u-th class="u-th">{{ $t("message.CommissionedLocation") }}</u-th>
<u-th class="u-th">{{ $t("message.po_MaterielDes") }}</u-th> <u-th class="u-th">{{ $t("message.CommissionedGoOutNumber") }}</u-th>
<u-th class="u-th">{{ $t("message.operation") }}</u-th> <u-th class="u-th">{{ $t("message.operation") }}</u-th>
</u-tr> </u-tr>
<u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index"> <u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
<u-td class="u-td">{{ item.productCode }}</u-td> <u-td class="u-td">{{ item.locationCode }}</u-td>
<u-td class="u-td">{{ item.productDescZh }}</u-td> <u-td class="u-td">{{ item.scanAmount }}</u-td>
<u-td class="u-td"> <u-td class="u-td">
<div class="u-td" @click="deleteItem(index)"> <div class="u-td" @click="deleteItem(index)">
{{ $t("message.product_Delete") }} {{ $t("message.product_Delete") }}
@ -106,17 +101,17 @@
<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="toPage(page.raw.commission.entrant.detail)"> <u-button type="primary" @click="gooutInfo">
{{ {{
$t('message.CommissionedEntrantDetails') $t('message.CommissionedGoOutDetails')
}} }}
</u-button> </u-button>
</u-col> </u-col>
<u-col :span="4"> <u-col :span="4">
<u-button type="primary" @click="resetHandle">{{ $t('message.product_Upload') }}</u-button> <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
</u-col> </u-col>
<u-col :span="4"> <u-col :span="4">
<u-button type="error" @click="onOk">{{ $t('message.po_Return') }}</u-button> <u-button type="error" @click="back">{{ $t('message.po_Return') }}</u-button>
</u-col> </u-col>
<!-- <u-col :span="3">--> <!-- <u-col :span="3">-->
<!-- <u-button type="success" @click="uni.navigateBack()">重提</u-button>--> <!-- <u-button type="success" @click="uni.navigateBack()">重提</u-button>-->
@ -143,6 +138,7 @@ export default class stoOutboundDom extends BasePage {
* 表格引用 * 表格引用
*/ */
@Ref('table') readonly $table: any; @Ref('table') readonly $table: any;
LocationList: any = []; LocationList: any = [];
/** /**
* 页面Module * 页面Module
@ -161,13 +157,26 @@ LocationList: any = [];
* 表单数据 * 表单数据
*/ */
form = { form = {
// poNo
poNo:null,
// 物料号
materialCode:null,
// 物料描述
materialDesc:null,
poLine:null,
unit:null,
// 累计出库数量
receiptAmount:null,
// 需求数量
poAmount: '',
locationCode:null,//库位
dockCode: null, // 月台类型code dockCode: null, // 月台类型code
dockName: null, // 月台类型name dockName: null, // 月台类型name
orderNo: null, orderNo: null,
qty: 0, qty: 0,
orderAmount: '',
productCode: 'test', // 物料类型name productCode: '', // 物料类型name
productDescZh: 'test', productDescZh: '',
scanAmount: '', scanAmount: '',
barCode: '', barCode: '',
}; };
@ -184,30 +193,30 @@ LocationList: any = [];
returningTypeSelect = false; returningTypeSelect = false;
// 物料类型选择 // 物料类型选择
materialCodeSelect = false; materialCodeSelect = false;
locationCodeSelect = false;
/** /**
* 表单验证规则 * 表单验证规则
*/ */
rules: VFormRules<any> = { rules: VFormRules<any> = {
orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }], orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }],
}; };
confirm() {
// if (this.wlCode == "" || this.number == "") {
// uni.showToast({
// icon: "none",
// title: "请输入正确的库位和数量",
// });
// return;
// }
this.LocationList.push(this.form)
}
deleteItem(index: any) {
this.LocationList.splice(index, 1);
}
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
async onReady() { async onReady() {
this.$form.setRules(this.rules); this.$form.setRules(this.rules);
model.queryReturningTypeList(); model.queryByFactoryCodeAndWorkAreaCode();
}
gooutInfo(){
if(this.form.poNo){
this.toPage(`${this.page.raw.commission.entrant.detail}?poNo=${this.form.poNo}`)
}else{
let tip = this.$t('message.borrow_Tip')
uni.showToast({
icon: "none",
title: tip as string,
});
}
} }
onCheck(e: any) { onCheck(e: any) {
console.log('e.data', e.data); console.log('e.data', e.data);
@ -218,11 +227,15 @@ LocationList: any = [];
}); });
} }
back() { back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 }); uni.navigateBack({ delta: 1 });
this.$table.onEmpty(); }
// 单号查询
async queryOrder(poNo:string){
const {orderInInfo} = await model.queryOrder(poNo)
Object.assign(this.form,{
orderInInfo
})
} }
materialConfirm(v: any) { materialConfirm(v: any) {
console.log('v[0].value', v[0]); console.log('v[0].value', v[0]);
@ -231,12 +244,24 @@ LocationList: any = [];
if (v[0].value == item.stoItem) { if (v[0].value == item.stoItem) {
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.poAmount = item.poAmount;
this.form.scanAmount = item.scanAmount; this.form.scanAmount = item.scanAmount;
} }
}); });
console.log('this.form', this.form); console.log('this.form', this.form);
} }
locationCodeConfirm(v: any) {
console.log('v[0].value', v[0]);
// this.form.productCode = v[0].value;
this.model.locationCodeList.forEach((item: any) => {
console.log('item',item)
if (v[0].value == item.value) {
this.form.locationCode = item.value;
}
});
console.log('this.form', this.form);
}
/** /**
* 清空 * 清空
*/ */
@ -246,68 +271,81 @@ LocationList: any = [];
this.model.materielList.forEach((item: any) => { this.model.materielList.forEach((item: any) => {
if (this.form.productCode == item.label) { if (this.form.productCode == item.label) {
this.form.productDescZh = item.materialDesc; this.form.productDescZh = item.materialDesc;
this.form.orderAmount = item.orderAmount; this.form.poAmount = item.poAmount;
this.form.scanAmount = item.scanAmount; this.form.scanAmount = item.scanAmount;
} }
}); });
} }
confirm() {
// if (this.wlCode == "" || this.number == "") {
// uni.showToast({
// icon: "none",
// title: "请输入正确的库位和数量",
// });
// return;
// }
console.log('123')
this.LocationList.push(this.form)
}
deleteItem(index: any) {
this.LocationList.splice(index, 1);
}
/** /**
* 条码回车 * 提交
*/ */
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({ icon: 'none', title: this.$t('message.product_Tip5') as string }); // uni.showToast({ icon: 'none', title: this.$t('message.product_Tip5') as string });
return; // return;
} // }
if (parseInt(this.form.orderAmount) <= parseInt(this.form.scanAmount)) { // if (parseInt(this.form.poAmount) <= parseInt(this.form.scanAmount)) {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip6') as string }); // uni.showToast({ icon: 'none', title: this.$t('message.product_Tip6') as string });
return; // return;
} // }
let list = [ const list = this.LocationList.map( (item:any) =>({
{ wlCode:item.locationCode,
order3: this.form.orderNo, nowAmount:item.scanAmount,
productCode: this.form.productCode, }))
productDescZh: this.form.productDescZh,
barCode: this.form.barCode,
dockCode: this.form.dockCode,
dockName: this.form.dockName,
orderType: 3,
type: 0,
keepBy: session.loginName as string,
loginName: session.loginName as string,
},
];
if (valid) { if (valid) {
const res = await this.model.tluSubmit(list); const res = await this.model.materialComplete({
poNo:this.form.poNo,
materialCode:this.form.materialCode,
list
});
console.log('fanhui ', res); console.log('fanhui ', res);
// if (res.barcode) { // if (res.barcode) {
// // this.materialList.push(res); // // this.materialList.push(res);
// this.form.scanAmount = res.scanAmount; // this.form.scanAmount = res.scanAmount;
// } // }
if (this.materialList.length == 0) { // if (this.materialList.length == 0) {
await this.materialList.push(res); // await this.materialList.push(res);
this.form.scanAmount += 1; // this.form.scanAmount += 1;
this.$table.onCheckAllTap(); // this.$table.onCheckAllTap();
} else { // } else {
let flag = 0; // let flag = 0;
for (let i = 0; i < this.materialList.length; i++) { // for (let i = 0; i < this.materialList.length; i++) {
console.log('11111', this.materialList[i]); // console.log('11111', this.materialList[i]);
if (this.form.barCode == this.materialList[i].barcode) { // if (this.form.barCode == this.materialList[i].barcode) {
flag = 1; // flag = 1;
break; // break;
} // }
} // }
if (flag == 0) { // if (flag == 0) {
await this.$table.onCheckAllTap(); // await this.$table.onCheckAllTap();
await this.materialList.push(res); // await this.materialList.push(res);
this.form.scanAmount += 1; // this.form.scanAmount += 1;
this.$table.onCheckAllTap(); // this.$table.onCheckAllTap();
} else { // } else {
uni.showToast({ icon: 'none', title: this.$t('message.product_Tip7') as string }); // uni.showToast({ icon: 'none', title: this.$t('message.product_Tip7') as string });
} // }
} // }
} }
}); });
const item = { const item = {
@ -361,7 +399,7 @@ LocationList: any = [];
this.form.productCode = ''; this.form.productCode = '';
// this.form.orderNo = null; // this.form.orderNo = null;
this.form.scanAmount = ''; this.form.scanAmount = '';
this.form.orderAmount = ''; this.form.poAmount = '';
this.form.productDescZh = ''; this.form.productDescZh = '';
this.selectMaterielList = []; this.selectMaterielList = [];
this.$table.onEmpty(); this.$table.onEmpty();

66
src/pages/raw/commission/entrant/model.ts
Unescape Escape View File

@ -24,10 +24,12 @@ export class ReturningModule extends VuexModule {
* 月台列表 * 月台列表
*/ */
returningTypeList: any[] = []; returningTypeList: any[] = [];
/** /**
* 物料列表 * 物料列表
*/ */
materielList: any[] = []; materielList: any[] = [];
locationCodeList: any[] =[];
//条码扫描的返回的结果 //条码扫描的返回的结果
oneMaterielDetail: any = {}; oneMaterielDetail: any = {};
@ -37,6 +39,69 @@ export class ReturningModule extends VuexModule {
orderInInfo: OrderInInfo = new OrderInInfo(); orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码 //记账按钮的code码
code = ''; code = '';
/**
* 委外出库单号查询
* @param orderNo
*/
@Action
async queryOrder(form:any) {
const result = await http.post(url.material.commission.entrant.queryOrder, {
...form,
loginName: session.loginName,
factoryCode:session.factoryCode
});
const orderInInfo = result.data.records[0] || {};
return { orderInInfo };
}
/**
* 库位
*/
@MutationAction
async queryByFactoryCodeAndWorkAreaCode() {
const list: [] = await http.post(url.material.commission.goOut.queryByFactoryCodeAndWorkAreaCode, {
factoryCode: session.factoryCode,
whCode: session.warehouseCode,
loginName: session.loginName,
});
const locationCodeList = list.map((item: any) => ({
label: item.locationCode,
value: item.locationCode,
}));
return { locationCodeList };
}
/**
* 提交
*/
@Action
async materialComplete(form:any) {
const res = await http.post(url.material.commission.goOut.materialComplete, {
factoryCode: session.factoryCode,
loginName: session.loginName,
...form
});
console.log(res,'>>>>>res')
}
/**
* 获取物料
*
* @returns
* @memberof ReturningModule
*/
@MutationAction
async info(poNo:string) {
const list: [] = await http.post(url.material.commission.entrant.info, {
factoryCode: session.factoryCode,
poNo: poNo,
loginName: session.loginName,
});
const locationCodeList = list.map((item: any) => ({
label: item.locationCode,
value: item.locationCode,
}));
return { locationCodeList };
}
/** /**
* 查询月台列表 * 查询月台列表
*/ */
@ -54,6 +119,7 @@ export class ReturningModule extends VuexModule {
return { returningTypeList }; return { returningTypeList };
} }
/** /**
* 查询订单号 * 查询订单号
* @param orderNo * @param orderNo

28
src/pages/raw/commission/goOut/config.ts
Unescape Escape View File

@ -1,7 +1,7 @@
/* /*
* @Author: zhou lei * @Author: zhou lei
* @Date: 2021-11-11 11:09:57 * @Date: 2021-11-11 11:09:57
* @LastEditTime: 2021-11-22 10:06:58 * @LastEditTime: 2021-11-22 15:16:21
* @LastEditors: zhou lei * @LastEditors: zhou lei
* @Description: * @Description:
* @FilePath: /wms_haiwai_app/src/pages/raw/commission/goOut/config.ts * @FilePath: /wms_haiwai_app/src/pages/raw/commission/goOut/config.ts
@ -13,18 +13,28 @@
import vm from '@/main'; import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.CommissionedLocation'), label: vm.$t('message.CommissionedSingleNumber'),
key: 'locationCode', key: 'poNo',
width: 200,
},
{
label: vm.$t('message.po_MaterielNo'),
key: 'materialCode',
width: 300,
},
{
label: vm.$t('message.CommissionedMaterielDesc'),
key: 'materialDesc',
width: 300, width: 300,
}, },
{ {
label: vm.$t('message.CommissionedGoOutNumber'), label: vm.$t('message.CommissionedGoOutNumber'),
key: 'scanAmount', key: 'outAmount',
width: 300, width: 200,
}, },
{ {
label: vm.$t('message.operation'), label: vm.$t('message.CommissionedLocation'),
key: 'materialDesc', key: 'wlCode',
width: 300, width: 200,
}, }
]; ];

38
src/pages/raw/commission/goOut/detail.vue
Unescape Escape View File

@ -26,41 +26,8 @@
>{{ $t('message.po_Total') }} {{ model.materielList.length }} >{{ $t('message.po_Total') }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col {{ $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>
@ -72,7 +39,7 @@ import model from './model';
import { headers } from './config'; import { headers } from './config';
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawCommissionGoOutDetail extends BasePage {
/** /**
* 页面Module * 页面Module
*/ */
@ -87,6 +54,9 @@ export default class RawReceiptDetail extends BasePage {
* 表头 * 表头
*/ */
headers = headers; headers = headers;
onLoad(params:any){
this.model.outInfo(params.poNo)
}
/** /**
* 逐条修改 * 逐条修改

22
src/pages/raw/commission/goOut/index.vue
Unescape Escape View File

@ -118,7 +118,7 @@
<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="toPage(page.raw.commission.goOut.detail)"> <u-button type="primary" @click="gooutInfo">
{{ {{
$t('message.CommissionedGoOutDetails') $t('message.CommissionedGoOutDetails')
}} }}
@ -128,7 +128,7 @@
<u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button> <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
</u-col> </u-col>
<u-col :span="4"> <u-col :span="4">
<u-button type="error" @click="onOk">{{ $t('message.po_Return') }}</u-button> <u-button type="error" @click="back">{{ $t('message.po_Return') }}</u-button>
</u-col> </u-col>
<!-- <u-col :span="3">--> <!-- <u-col :span="3">-->
<!-- <u-button type="success" @click="uni.navigateBack()">重提</u-button>--> <!-- <u-button type="success" @click="uni.navigateBack()">重提</u-button>-->
@ -223,6 +223,18 @@ export default class stoOutboundDom extends BasePage {
this.$form.setRules(this.rules); this.$form.setRules(this.rules);
model.queryByFactoryCodeAndWorkAreaCode(); model.queryByFactoryCodeAndWorkAreaCode();
} }
gooutInfo(){
if(this.form.poNo){
this.toPage(`${this.page.raw.commission.goOut.detail}?poNo=${this.form.poNo}`)
}else{
let tip = this.$t('message.borrow_Tip')
uni.showToast({
icon: "none",
title: tip as string,
});
}
}
onCheck(e: any) { onCheck(e: any) {
console.log('e.data', e.data); console.log('e.data', e.data);
this.selectMaterielList = []; this.selectMaterielList = [];
@ -232,18 +244,14 @@ export default class stoOutboundDom extends BasePage {
}); });
} }
back() { back() {
this.form.barCode = '';
this.model.orderInInfo.stoAmount = 0;
this.selectMaterielList = [];
uni.navigateBack({ delta: 1 }); uni.navigateBack({ delta: 1 });
this.$table.onEmpty();
} }
// 单号查询 // 单号查询
async queryOrder(poNo:string){ async queryOrder(poNo:string){
const {orderInInfo} = await model.queryOrder(poNo) const {orderInInfo} = await model.queryOrder(poNo)
Object.assign(this.form,{ Object.assign(this.form,{
...orderInInfo orderInInfo
}) })
} }
materialConfirm(v: any) { materialConfirm(v: any) {

19
src/pages/raw/commission/goOut/model.ts
Unescape Escape View File

@ -69,6 +69,25 @@ export class ReturningModule extends VuexModule {
})); }));
return { locationCodeList }; return { locationCodeList };
} }
/**
* 获取物料
*
* @returns
* @memberof ReturningModule
*/
@MutationAction
async outInfo(poNo:string) {
const list: [] = await http.post(url.material.commission.goOut.outInfo, {
factoryCode: session.factoryCode,
poNo: poNo,
loginName: session.loginName,
});
const locationCodeList = list.map((item: any) => ({
label: item.locationCode,
value: item.locationCode,
}));
return { locationCodeList };
}
/** /**
* 提交 * 提交

11
src/utils/url.ts
Unescape Escape View File

@ -97,6 +97,17 @@ export const url = {
// 出库明细查询 // 出库明细查询
outInfo: "/material/outsourcing/outInfo", outInfo: "/material/outsourcing/outInfo",
}, },
entrant:{
// 单号查询
queryOrder:'/material/outsourcing/into/queryOrder',
// 库位下拉列表
queryByFactoryCodeAndWorkAreaCode: "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
// 提交
materialComplete:'/material/outsourcing/into/materialComplete',
// 明细查询
info:'/material/outsourcing/into/info',
}
}, },
}, },
SFG: { SFG: {

Write Preview
Loading…
Cancel
Save