|
|
|
|
@ -150,7 +150,7 @@
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<!-- <el-col :span="24">
|
|
|
|
|
<div style="padding:15px 0px">
|
|
|
|
|
<span style="color: #409EFF;">▋</span>
|
|
|
|
|
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">出库凭证</span>
|
|
|
|
|
@ -160,27 +160,6 @@
|
|
|
|
|
<jnpf-form-tip-item label-width="0">
|
|
|
|
|
<el-table :data="dataForm.warehousingOutboundPoundlistList" size='mini' border>
|
|
|
|
|
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
|
|
|
|
|
<!-- <el-table-column label="关联凭证" min-width="150px"
|
|
|
|
|
v-if="judgeShow('warehousingoutboundpoundlist-voucherId')" prop="voucherId"
|
|
|
|
|
align="center" width="220" fixed="left">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"
|
|
|
|
|
v-if="judgeRequired('warehousingoutboundpoundlistList-voucherId')">*</span>关联凭证
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfPopupSelect v-model="scope.row.voucherId" @change="changeDataVoucher"
|
|
|
|
|
:rowIndex="scope.$index" :formData="dataForm"
|
|
|
|
|
:templateJson="interfaceRes.warehousingoutboundpoundlistvoucherId"
|
|
|
|
|
placeholder="请选择" disabled hasPage propsValue="id" popupWidth="800px"
|
|
|
|
|
popupTitle="选择数据" popupType="dialog" relationField='voucher_code'
|
|
|
|
|
:field="'voucherId' + scope.$index" interfaceId="529929122277773509"
|
|
|
|
|
:pageSize="20"
|
|
|
|
|
:columnOptions="warehousingoutboundpoundlistvoucherIdcolumnOptions" clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfPopupSelect>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
|
|
<el-table-column label="关联凭证" prop="voucherCode" align="center" width="250">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"></span>关联凭证
|
|
|
|
|
@ -191,7 +170,6 @@
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<el-table-column label="单据类型" prop="documentTypes" align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"></span>单据类型
|
|
|
|
|
@ -212,31 +190,9 @@
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<!-- <el-table-column label="磅单编号" prop="poundCode" align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"></span>磅单编号
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.poundCode" placeholder="请输入" disabled clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
|
|
<!-- <el-table-column label="磅单时间" prop="poundlistTime" align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"></span>磅单时间
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.poundlistTime" placeholder="请输入" disabled
|
|
|
|
|
clearable :style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
|
|
<el-table-column label="磅单时间"
|
|
|
|
|
<!-- <el-table-column label="磅单时间"
|
|
|
|
|
v-if="judgeShow('warehousingoutboundpoundlist-poundlistTime')"
|
|
|
|
|
prop="poundlistTime" width="200" align="center">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
@ -336,17 +292,6 @@
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
|
|
<!-- <el-table-column label="备注" prop="remark" align="center" width="150">
|
|
|
|
|
<template slot="header">
|
|
|
|
|
<span class="required-sign"></span>备注
|
|
|
|
|
</template>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<JnpfInput v-model="scope.row.remark" placeholder="请输入" disabled clearable
|
|
|
|
|
:style='{ "width": "100%" }'>
|
|
|
|
|
</JnpfInput>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column> -->
|
|
|
|
|
|
|
|
|
|
<el-table-column label="操作" width="50" align="center" fixed="right"
|
|
|
|
|
v-if="!judgeWrite('warehousingoutboundpoundlistList')">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
@ -354,18 +299,18 @@
|
|
|
|
|
@click="delwarehousingoutboundpoundlistList(scope.$index)">删除</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
<!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()"
|
|
|
|
|
</el-table> -->
|
|
|
|
|
<!-- <div class="table-actions" @click="addwarehousingoutboundpoundlistList()"
|
|
|
|
|
v-if="!judgeWrite('warehousingoutboundpoundlistList')">
|
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
|
</div> -->
|
|
|
|
|
|
|
|
|
|
<div class="table-actions" @click="choice(dataForm.warehousingId)"
|
|
|
|
|
<!-- <div class="table-actions" @click="choice(dataForm.warehousingId)"
|
|
|
|
|
v-if="!judgeWrite('warehousingoutboundpoundlistList')">
|
|
|
|
|
<el-button type="text" icon="el-icon-plus">添加</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</div> -->
|
|
|
|
|
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</jnpf-form-tip-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24">
|
|
|
|
|
<div style="padding:15px 0px">
|
|
|
|
|
@ -777,9 +722,10 @@ export default {
|
|
|
|
|
spec: e.spec,
|
|
|
|
|
inventoryUnitId: e.inventoryUnitId,
|
|
|
|
|
outboundUnit: e.inventoryUnitId,
|
|
|
|
|
outboundNumber: e.purchaseNum,
|
|
|
|
|
outboundNumber: e.notificationStorageNumber,
|
|
|
|
|
outboundAreaId: e.storageAreaId,
|
|
|
|
|
batchNumber: e.batchNo,
|
|
|
|
|
inventoryNumber: e.inventoryNumber,
|
|
|
|
|
storageNumber: e.storageNumber,
|
|
|
|
|
receivedQuantity: e.receivedQuantity,
|
|
|
|
|
businessPrice: e.businessPrice,
|
|
|
|
|
@ -921,56 +867,56 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!this.warehousingoutboundpoundlistExist()) return
|
|
|
|
|
// if (!this.warehousingoutboundpoundlistExist()) return
|
|
|
|
|
if (!this.warehousingoutboundproductExist()) return
|
|
|
|
|
if (!this.warehousingoutboundproductExist1()) return
|
|
|
|
|
// if (!this.warehousingoutboundproductExist1()) return
|
|
|
|
|
|
|
|
|
|
return isOk
|
|
|
|
|
},
|
|
|
|
|
warehousingoutboundpoundlistExist() {
|
|
|
|
|
let isOk = true;
|
|
|
|
|
for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) {
|
|
|
|
|
const e = this.dataForm.warehousingOutboundPoundlistList[i];
|
|
|
|
|
if (!e.voucherId) {
|
|
|
|
|
this.$message({
|
|
|
|
|
message: '关联凭证不能为空',
|
|
|
|
|
type: 'error',
|
|
|
|
|
duration: 1000
|
|
|
|
|
});
|
|
|
|
|
isOk = false
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return isOk;
|
|
|
|
|
},
|
|
|
|
|
// warehousingoutboundpoundlistExist() {
|
|
|
|
|
// let isOk = true;
|
|
|
|
|
// for (let i = 0; i < this.dataForm.warehousingOutboundPoundlistList.length; i++) {
|
|
|
|
|
// const e = this.dataForm.warehousingOutboundPoundlistList[i];
|
|
|
|
|
// if (!e.voucherId) {
|
|
|
|
|
// this.$message({
|
|
|
|
|
// message: '关联凭证不能为空',
|
|
|
|
|
// type: 'error',
|
|
|
|
|
// duration: 1000
|
|
|
|
|
// });
|
|
|
|
|
// isOk = false
|
|
|
|
|
// break
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// return isOk;
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
|
|
warehousingoutboundproductExist1() {
|
|
|
|
|
let isOk = true;
|
|
|
|
|
var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList))
|
|
|
|
|
var echararr = [];
|
|
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
|
|
var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
|
|
|
|
|
if (arrindex == -1) {
|
|
|
|
|
echararr.push(data[i]);
|
|
|
|
|
} else {
|
|
|
|
|
echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
echararr.forEach(item => {
|
|
|
|
|
// warehousingoutboundproductExist1() {
|
|
|
|
|
// let isOk = true;
|
|
|
|
|
// var data = JSON.parse(JSON.stringify(this.dataForm.warehousingOutboundPoundlistList))
|
|
|
|
|
// var echararr = [];
|
|
|
|
|
// for (var i = 0; i < data.length; i++) {
|
|
|
|
|
// var arrindex = echararr.findIndex((item) => { return item.productId == data[i].productId && item.unit == data[i].unit })
|
|
|
|
|
// if (arrindex == -1) {
|
|
|
|
|
// echararr.push(data[i]);
|
|
|
|
|
// } else {
|
|
|
|
|
// echararr[arrindex].netWeight = this.jnpf.floatAdd(echararr[arrindex].netWeight, data[i].netWeight)
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// echararr.forEach(item => {
|
|
|
|
|
|
|
|
|
|
const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight)
|
|
|
|
|
if (!flag) {
|
|
|
|
|
this.$message({
|
|
|
|
|
message: '凭证与商品不一致',
|
|
|
|
|
type: 'error',
|
|
|
|
|
duration: 1000
|
|
|
|
|
});
|
|
|
|
|
isOk = false
|
|
|
|
|
return isOk
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
return isOk
|
|
|
|
|
},
|
|
|
|
|
// const flag = this.dataForm.warehousingOutboundProductList.find(e => e.productId == item.productId && e.outboundUnit == item.unit && e.outboundNumber == item.netWeight)
|
|
|
|
|
// if (!flag) {
|
|
|
|
|
// this.$message({
|
|
|
|
|
// message: '凭证与商品不一致',
|
|
|
|
|
// type: 'error',
|
|
|
|
|
// duration: 1000
|
|
|
|
|
// });
|
|
|
|
|
// isOk = false
|
|
|
|
|
// return isOk
|
|
|
|
|
// }
|
|
|
|
|
// })
|
|
|
|
|
// return isOk
|
|
|
|
|
// },
|
|
|
|
|
|
|
|
|
|
warehousingoutboundproductExist() {
|
|
|
|
|
let isOk = true;
|
|
|
|
|
|
胡川虎
4 months ago