|
|
|
|
@ -11,6 +11,7 @@
|
|
|
|
|
<view class="title">{{ $t("message.dn_ReceivingGoods") }}</view>
|
|
|
|
|
<view class="right"></view>
|
|
|
|
|
</view>
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<view class="content">
|
|
|
|
|
<!-- 单号 -->
|
|
|
|
|
<view class="single">
|
|
|
|
|
@ -22,6 +23,96 @@
|
|
|
|
|
@search="query"
|
|
|
|
|
:show-action="false"
|
|
|
|
|
></u-search>
|
|
|
|
|
=======
|
|
|
|
|
<u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="150rpx">
|
|
|
|
|
<u-form-item :required="true" :label="$t('message.CommissionedSingleNumber')" prop="poNo">
|
|
|
|
|
<!-- 单号 -->
|
|
|
|
|
<u-search
|
|
|
|
|
:placeholder="$t('message.po_PleaseInput')"
|
|
|
|
|
v-model="form.poNo"
|
|
|
|
|
@search="queryOrder"
|
|
|
|
|
:show-action="false"
|
|
|
|
|
></u-search>
|
|
|
|
|
</u-form-item>
|
|
|
|
|
<u-row gutter="0">
|
|
|
|
|
<!-- 物料号 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :label="$t('message.CommissionedMaterielNo')">
|
|
|
|
|
<u-input v-model="form.materialCode" :placeholder="$t('message.po_PleaseInput')" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
<!-- 物料描述 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :label="$t('message.CommissionedMaterielDesc')">
|
|
|
|
|
<u-input v-model="form.materialDesc" :placeholder="$t('message.po_PleaseInput')" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
<u-row gutter="0">
|
|
|
|
|
<!-- 需求数量 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :label="$t('message.CommissionedDemandData')">
|
|
|
|
|
<u-input v-model="form.poAmount" :placeholder="$t('message.po_PleaseInput')" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
<!-- 累计出库数量 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :label="$t('message.CommissionedCumulativeData')">
|
|
|
|
|
<u-input v-model="form.receiptAmount" :placeholder="$t('message.po_PleaseInput')" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
<u-row gutter="0">
|
|
|
|
|
<!-- 库位 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :required="true" :label="$t('message.CommissionedLocation')">
|
|
|
|
|
<u-input
|
|
|
|
|
v-model="form.locationCode"
|
|
|
|
|
type="select"
|
|
|
|
|
@click="locationCodeSelect = true"
|
|
|
|
|
:placeholder="$t('message.po_PleaseInput')"
|
|
|
|
|
/>
|
|
|
|
|
<u-select
|
|
|
|
|
:confirm-text="$t('message.product_Confirm')"
|
|
|
|
|
:cancel-text="$t('message.product_Cancel')"
|
|
|
|
|
v-model="locationCodeSelect"
|
|
|
|
|
:list="model.locationCodeList"
|
|
|
|
|
@confirm="locationCodeConfirm"
|
|
|
|
|
></u-select>
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
<!-- 本次数量 -->
|
|
|
|
|
<u-col :span="6">
|
|
|
|
|
<u-form-item :label="$t('message.CommissionedThisNumber')">
|
|
|
|
|
<u-input v-model="form.scanAmount" :placeholder="$t('message.po_PleaseInput')" />
|
|
|
|
|
</u-form-item>
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
<u-row>
|
|
|
|
|
<u-col :span="8"></u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button :style="{margin:'24rpx 0'}" type="primary" size="medium" class="confirm" @click="confirm">{{$t('message.product_add')}}</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
<u-col :span="12">
|
|
|
|
|
<view class="table-wrapper">
|
|
|
|
|
<u-table class="library-table">
|
|
|
|
|
<u-tr class="u-tr">
|
|
|
|
|
<u-th class="u-th">{{ $t("message.CommissionedLocation") }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t("message.CommissionedGoOutNumber") }}</u-th>
|
|
|
|
|
<u-th class="u-th">{{ $t("message.operation") }}</u-th>
|
|
|
|
|
</u-tr>
|
|
|
|
|
<u-tr class="u-tr" v-for="(item, index) in LocationList" :key="index">
|
|
|
|
|
<u-td class="u-td">{{ item.locationCode }}</u-td>
|
|
|
|
|
<u-td class="u-td">{{ item.scanAmount }}</u-td>
|
|
|
|
|
<u-td class="u-td">
|
|
|
|
|
<div class="u-td" @click="deleteItem(index)">
|
|
|
|
|
{{ $t("message.product_Delete") }}
|
|
|
|
|
</div>
|
|
|
|
|
</u-td>
|
|
|
|
|
</u-tr>
|
|
|
|
|
</u-table>
|
|
|
|
|
>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846
|
|
|
|
|
</view>
|
|
|
|
|
<view class="single-right">
|
|
|
|
|
<u-button type="primary" @click="query">查询</u-button>
|
|
|
|
|
@ -122,6 +213,7 @@
|
|
|
|
|
<view class="bottom-bar">
|
|
|
|
|
<u-row class="button-bar">
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
<u-button type="primary" @click="bill">收货明细</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
@ -129,12 +221,26 @@
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="error" @click="back">返回</u-button>
|
|
|
|
|
=======
|
|
|
|
|
<u-button type="primary" @click="gooutInfo">
|
|
|
|
|
{{
|
|
|
|
|
$t('message.CommissionedGoOutDetails')
|
|
|
|
|
}}
|
|
|
|
|
</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
|
|
|
|
|
</u-col>
|
|
|
|
|
<u-col :span="4">
|
|
|
|
|
<u-button type="error" @click="back">{{ $t('message.po_Return') }}</u-button>
|
|
|
|
|
>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846
|
|
|
|
|
</u-col>
|
|
|
|
|
</u-row>
|
|
|
|
|
</view>
|
|
|
|
|
</view>
|
|
|
|
|
</template>
|
|
|
|
|
<script lang="ts">
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
import { Component, Ref } from "vue-property-decorator";
|
|
|
|
|
import { BasePage } from "@/components/base/page";
|
|
|
|
|
import jPicker from "@/components/J-Picker/jPicker.vue";
|
|
|
|
|
@ -184,8 +290,136 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
|
pickerName.value = item.locationCode + "(" + item.sendSpot + ")";
|
|
|
|
|
pickerName.sendSpot = item.sendSpot;
|
|
|
|
|
this.Location.push(pickerName);
|
|
|
|
|
=======
|
|
|
|
|
import { Component, Ref } from 'vue-property-decorator';
|
|
|
|
|
import { BasePage } from '@/components/base/page';
|
|
|
|
|
import { VForm, VFormRules } from 'vue/types/form';
|
|
|
|
|
import model from './model';
|
|
|
|
|
import { session } from '@/store/modules/session';
|
|
|
|
|
import { headers } from './config';
|
|
|
|
|
@Component
|
|
|
|
|
export default class stoOutboundDom extends BasePage {
|
|
|
|
|
/**
|
|
|
|
|
* 表单引用
|
|
|
|
|
*/
|
|
|
|
|
@Ref('form') readonly $form!: VForm;
|
|
|
|
|
/**
|
|
|
|
|
* 表格引用
|
|
|
|
|
*/
|
|
|
|
|
@Ref('table') readonly $table: any;
|
|
|
|
|
|
|
|
|
|
LocationList: any = [];
|
|
|
|
|
/**
|
|
|
|
|
* 页面Module
|
|
|
|
|
*/
|
|
|
|
|
model = model;
|
|
|
|
|
/**
|
|
|
|
|
* search焦点获取
|
|
|
|
|
*/
|
|
|
|
|
firstFocus = false;
|
|
|
|
|
/**
|
|
|
|
|
* 表头
|
|
|
|
|
*/
|
|
|
|
|
headers = headers;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 表单数据
|
|
|
|
|
*/
|
|
|
|
|
form = {
|
|
|
|
|
// poNo
|
|
|
|
|
poNo:null,
|
|
|
|
|
// 物料号
|
|
|
|
|
materialCode:null,
|
|
|
|
|
// 物料描述
|
|
|
|
|
materialDesc:null,
|
|
|
|
|
poLine:null,
|
|
|
|
|
unit:null,
|
|
|
|
|
// 累计出库数量
|
|
|
|
|
receiptAmount:null,
|
|
|
|
|
// 需求数量
|
|
|
|
|
poAmount: '',
|
|
|
|
|
locationCode:null,//库位
|
|
|
|
|
dockCode: null, // 月台类型code
|
|
|
|
|
dockName: null, // 月台类型name
|
|
|
|
|
orderNo: null,
|
|
|
|
|
qty: 0,
|
|
|
|
|
|
|
|
|
|
productCode: '', // 物料类型name
|
|
|
|
|
productDescZh: '',
|
|
|
|
|
scanAmount: '',
|
|
|
|
|
barCode: '',
|
|
|
|
|
};
|
|
|
|
|
materialList: any = []; //物料列表
|
|
|
|
|
//被选中的表格数据
|
|
|
|
|
selectMaterielList: any = [];
|
|
|
|
|
/**
|
|
|
|
|
* 工位退料人名称
|
|
|
|
|
*/
|
|
|
|
|
operatorName = '';
|
|
|
|
|
/**
|
|
|
|
|
* 退料类型选择
|
|
|
|
|
*/
|
|
|
|
|
returningTypeSelect = false;
|
|
|
|
|
// 物料类型选择
|
|
|
|
|
materialCodeSelect = false;
|
|
|
|
|
locationCodeSelect = false;
|
|
|
|
|
/**
|
|
|
|
|
* 表单验证规则
|
|
|
|
|
*/
|
|
|
|
|
rules: VFormRules<any> = {
|
|
|
|
|
orderNo: [{ required: true, message: this.$t('message.product_Tip4') as string }],
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
|
|
|
|
|
async onReady() {
|
|
|
|
|
this.$form.setRules(this.rules);
|
|
|
|
|
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) {
|
|
|
|
|
console.log('e.data', e.data);
|
|
|
|
|
this.selectMaterielList = [];
|
|
|
|
|
e.data.forEach((line: any) => {
|
|
|
|
|
const { lineData: item } = line;
|
|
|
|
|
this.selectMaterielList.push(item);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
back() {
|
|
|
|
|
uni.navigateBack({ delta: 1 });
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 单号查询
|
|
|
|
|
async queryOrder(poNo:string){
|
|
|
|
|
const {orderInInfo} = await model.queryOrder(poNo)
|
|
|
|
|
Object.assign(this.form,{
|
|
|
|
|
orderInInfo
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
materialConfirm(v: any) {
|
|
|
|
|
console.log('v[0].value', v[0]);
|
|
|
|
|
// 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.poAmount = item.poAmount;
|
|
|
|
|
this.form.scanAmount = item.scanAmount;
|
|
|
|
|
}
|
|
|
|
|
>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
//输入单号 查询数据
|
|
|
|
|
async query() {
|
|
|
|
|
if (this.form.documentNo == "") {
|
|
|
|
|
@ -210,6 +444,104 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
|
if (item.materialCode == e.pickerName.value) {
|
|
|
|
|
this.every = item;
|
|
|
|
|
return;
|
|
|
|
|
=======
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 清空
|
|
|
|
|
*/
|
|
|
|
|
resetHandle() {
|
|
|
|
|
this.materialList = [];
|
|
|
|
|
this.$table.onCheckAllTap();
|
|
|
|
|
this.model.materielList.forEach((item: any) => {
|
|
|
|
|
if (this.form.productCode == item.label) {
|
|
|
|
|
this.form.productDescZh = item.materialDesc;
|
|
|
|
|
this.form.poAmount = item.poAmount;
|
|
|
|
|
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() {
|
|
|
|
|
this.$form.validate(async (valid: boolean) => {
|
|
|
|
|
// 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 });
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
// if (parseInt(this.form.poAmount) <= parseInt(this.form.scanAmount)) {
|
|
|
|
|
// uni.showToast({ icon: 'none', title: this.$t('message.product_Tip6') as string });
|
|
|
|
|
// return;
|
|
|
|
|
// }
|
|
|
|
|
const list = this.LocationList.map( (item:any) =>({
|
|
|
|
|
wlCode:item.locationCode,
|
|
|
|
|
nowAmount:item.scanAmount,
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
if (valid) {
|
|
|
|
|
const res = await this.model.materialComplete({
|
|
|
|
|
poNo:this.form.poNo,
|
|
|
|
|
materialCode:this.form.materialCode,
|
|
|
|
|
list
|
|
|
|
|
});
|
|
|
|
|
console.log('fanhui ', res);
|
|
|
|
|
// if (res.barcode) {
|
|
|
|
|
// // this.materialList.push(res);
|
|
|
|
|
// this.form.scanAmount = res.scanAmount;
|
|
|
|
|
// }
|
|
|
|
|
// if (this.materialList.length == 0) {
|
|
|
|
|
// await this.materialList.push(res);
|
|
|
|
|
// this.form.scanAmount += 1;
|
|
|
|
|
// this.$table.onCheckAllTap();
|
|
|
|
|
// } else {
|
|
|
|
|
// let flag = 0;
|
|
|
|
|
// for (let i = 0; i < this.materialList.length; i++) {
|
|
|
|
|
// console.log('11111', this.materialList[i]);
|
|
|
|
|
// if (this.form.barCode == this.materialList[i].barcode) {
|
|
|
|
|
// flag = 1;
|
|
|
|
|
// break;
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// if (flag == 0) {
|
|
|
|
|
// await this.$table.onCheckAllTap();
|
|
|
|
|
// await this.materialList.push(res);
|
|
|
|
|
// this.form.scanAmount += 1;
|
|
|
|
|
// this.$table.onCheckAllTap();
|
|
|
|
|
// } else {
|
|
|
|
|
// uni.showToast({ icon: 'none', title: this.$t('message.product_Tip7') as string });
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
@ -281,7 +613,18 @@ export default class dnReceiptDom extends BasePage {
|
|
|
|
|
this.list.forEach((item: any) => {
|
|
|
|
|
num += parseFloat(item.nowAmount);
|
|
|
|
|
});
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
this.every.receiptAmount = num;
|
|
|
|
|
=======
|
|
|
|
|
this.form.barCode = '';
|
|
|
|
|
this.form.productCode = '';
|
|
|
|
|
// this.form.orderNo = null;
|
|
|
|
|
this.form.scanAmount = '';
|
|
|
|
|
this.form.poAmount = '';
|
|
|
|
|
this.form.productDescZh = '';
|
|
|
|
|
this.selectMaterielList = [];
|
|
|
|
|
this.$table.onEmpty();
|
|
|
|
|
>>>>>>> 74ef32f2cb5f9041e0e6ce27215dabf1d9c4b846
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
</script>
|
|
|
|
|
|
hou
4 years ago