|
|
|
@ -70,13 +70,13 @@ |
|
|
|
|
|
|
|
<el-col :span="12"> |
|
|
|
<div class="span-sty">到货日期</div> |
|
|
|
<el-form-item><el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo" value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期"> |
|
|
|
<el-form-item><el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo" |
|
|
|
value-format="yyyy-MM-dd" placeholder="选择日期"> |
|
|
|
</el-date-picker></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<div class="span-sty">单据状态</div> |
|
|
|
<el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item> |
|
|
|
<el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item> |
|
|
|
</el-col> |
|
|
|
|
|
|
|
</el-row> |
|
|
|
@ -86,59 +86,54 @@ |
|
|
|
<el-col :span="24"> |
|
|
|
<div class="span-sty">备注</div> |
|
|
|
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" |
|
|
|
type="textarea" :rows="4" clearable /></el-form-item> |
|
|
|
type="textarea" :rows="4" clearable /></el-form-item> |
|
|
|
</el-col> |
|
|
|
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
<div class="title titleOne"> |
|
|
|
<div>商品列表</div> |
|
|
|
<div class="span" @click="batchAddAll()">批次收货</div> |
|
|
|
<el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button> |
|
|
|
</div> |
|
|
|
<el-table :key="tableKey" v-loading="listLoading" :data="formobj.list" :index="index" border |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column width="60" label="序号" type="index" :index="index + 1" align="center" /> |
|
|
|
<div v-if="isUpdata"> |
|
|
|
<el-table-column label="操作" align="center" width="180"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button> |
|
|
|
<el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" /> |
|
|
|
</div> |
|
|
|
<div v-else> |
|
|
|
<el-table-column align="center" width="70"> |
|
|
|
<template slot="header"> |
|
|
|
<i class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" @click="commodityAdd"></i> |
|
|
|
</template> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="商品名称" align="center" min-width="200"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-popover placement="right" width="900" trigger="click"> |
|
|
|
<div> |
|
|
|
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row |
|
|
|
@current-change="commodityCurrentChange($event, scope.row)"> |
|
|
|
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> |
|
|
|
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> |
|
|
|
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> |
|
|
|
<el-table-column prop="unit" label="单位" align="center" /> |
|
|
|
<el-table-column prop="warehouseName" label="仓库" align="center" /> |
|
|
|
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> |
|
|
|
<el-table-column prop="count" label="库存数量" align="center" /> |
|
|
|
</el-table> |
|
|
|
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" |
|
|
|
layout="total, pager" :total="commodityQuery.total" /> |
|
|
|
</div> |
|
|
|
<el-input slot="reference" v-model="scope.row.goodsSpuName" |
|
|
|
@input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" /> |
|
|
|
</el-popover> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</div> |
|
|
|
style="width: 100%;" ref="dataTable"> |
|
|
|
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> |
|
|
|
<el-table-column align="center" width="180"> |
|
|
|
<template slot="header" slot-scope="scope"> |
|
|
|
<i v-if="!isUpdata" class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" |
|
|
|
@click="commodityAdd(scope.row)"></i> |
|
|
|
<span v-else>操作</span> |
|
|
|
</template> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button> |
|
|
|
<el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> |
|
|
|
<!-- <i v-if="!isUpdata" class="el-icon-delete" @click="commodityDelete(scope.$index)"></i> --> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column v-if="isUpdata" label="商品名称" prop="goodsSkuTitle" align="center" width="200" /> |
|
|
|
|
|
|
|
<el-table-column label="商品名称" align="center" min-width="200" v-if="!isUpdata"> |
|
|
|
<template slot-scope="scope" v-if="!isUpdata"> |
|
|
|
<el-popover placement="right" width="900" trigger="click" v-if="!isUpdata"> |
|
|
|
<div> |
|
|
|
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row |
|
|
|
@current-change="commodityCurrentChange($event, scope.row)"> |
|
|
|
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> |
|
|
|
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> |
|
|
|
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> |
|
|
|
<el-table-column prop="unit" label="单位" align="center" /> |
|
|
|
<el-table-column prop="warehouseName" label="仓库" align="center" /> |
|
|
|
<el-table-column prop="warehouseRackName" label="库位" align="center" /> |
|
|
|
</el-table> |
|
|
|
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" |
|
|
|
layout="total, pager" :total="commodityQuery.total" /> |
|
|
|
</div> |
|
|
|
<el-input slot="reference" v-model="scope.row.goodsSpuName" |
|
|
|
@input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" /> |
|
|
|
</el-popover> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" /> |
|
|
|
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" /> |
|
|
|
<el-table-column label="单位" prop="unit" align="center" width="120" /> |
|
|
|
@ -161,7 +156,7 @@ |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> |
|
|
|
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" v-if="isUpdata" /> |
|
|
|
<el-table-column label="实收数量" align="center" width="120"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)" |
|
|
|
@ -332,8 +327,8 @@ |
|
|
|
// 调拨数量 |
|
|
|
totalQuantity() { |
|
|
|
let quantity = 0 |
|
|
|
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) { |
|
|
|
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => { |
|
|
|
if (this.formobj.list.length > 0) { |
|
|
|
this.formobj.list.forEach((e) => { |
|
|
|
quantity += Number(e.count) |
|
|
|
}) |
|
|
|
} |
|
|
|
@ -345,8 +340,8 @@ |
|
|
|
// 调拨金额 |
|
|
|
materialCost() { |
|
|
|
let material = 0 |
|
|
|
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) { |
|
|
|
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => { |
|
|
|
if (this.formobj.list.length > 0) { |
|
|
|
this.formobj.list.forEach((e) => { |
|
|
|
material += Number((Number(e.count) * Number(e.taxPrice))) |
|
|
|
}) |
|
|
|
} |
|
|
|
@ -363,7 +358,7 @@ |
|
|
|
commodityInput(value) { |
|
|
|
this.commodityQuery.params.name = value |
|
|
|
this.commodityLoading = true |
|
|
|
req.getGoods(this.commodityQuery).then((response) => { |
|
|
|
req.getGoodsListPage(this.commodityQuery).then((response) => { |
|
|
|
if (response.success) { |
|
|
|
this.commodityLoading = false |
|
|
|
this.commodityData = response.data.records |
|
|
|
@ -376,22 +371,26 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
commodityDelete(index) { |
|
|
|
this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1) |
|
|
|
this.formobj.list.splice(index, 1) |
|
|
|
}, |
|
|
|
commodityCurrentChange(value, row) { |
|
|
|
row.inventorySid = value.sid |
|
|
|
row.goodsSpuSid = value.goodsSpuSid |
|
|
|
row.goodsSpuName = value.goodsSpuName |
|
|
|
row.goodsSkuSid = value.goodsSkuSid |
|
|
|
row.goodsSkuTitle = value.goodsSkuTitle |
|
|
|
row.goodsSkuCode = value.goodsSkuCode |
|
|
|
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec |
|
|
|
row.unit = value.unit |
|
|
|
row.warehouseName = value.warehouseName |
|
|
|
row.warehouseSid = value.warehouseSid |
|
|
|
row.warehouseArea = value.warehouseRackCode |
|
|
|
row.warehouseAreasid = value.warehouseRackSid |
|
|
|
row.warehouseName = value.warehouseName |
|
|
|
row.warehouseRackSid = value.warehouseRackSid |
|
|
|
row.warehouseRackName = value.warehouseRackName |
|
|
|
row.isQuality = 0 |
|
|
|
row.qualityState = 0 |
|
|
|
row.cost = value.cost |
|
|
|
row.taxAmount = value.taxAmount |
|
|
|
row.taxPrice = value.taxPrice |
|
|
|
row.stockCount = value.count |
|
|
|
row.count = '' |
|
|
|
row.amount = '' |
|
|
|
row.amount = value.amount |
|
|
|
document.body.click() |
|
|
|
}, |
|
|
|
|
|
|
|
@ -415,25 +414,27 @@ |
|
|
|
}, |
|
|
|
commodityAdd() { |
|
|
|
this.formobj.list.push({ |
|
|
|
"sid": "", |
|
|
|
"billSid": "", |
|
|
|
"inventorySid": "", |
|
|
|
"goodsSpuName": "", |
|
|
|
"goodsSkuSid": "", |
|
|
|
"goodsSkuTitle": "", |
|
|
|
"goodsSkuCode": "", |
|
|
|
"goodsSkuOwnSpec": "", |
|
|
|
"carModel": "", |
|
|
|
"unit": "", |
|
|
|
"warehouseSid": "", |
|
|
|
"warehouseName": "", |
|
|
|
"warehouseAreasid": "", |
|
|
|
"warehouseArea": "", |
|
|
|
"warehouseRackSid": "", |
|
|
|
"warehouseRackName": "", |
|
|
|
"actualInCount": "", |
|
|
|
"rejectCount": "", |
|
|
|
"rejectReason": "", |
|
|
|
"isQuality": 0, |
|
|
|
"qualityState": 0, |
|
|
|
"packageRemark": "", |
|
|
|
"state": 0, |
|
|
|
"xh": "", |
|
|
|
"orderCount": "", |
|
|
|
"cost": "", |
|
|
|
"taxAmount": "", |
|
|
|
"taxPrice": "", |
|
|
|
"stockCount": "", |
|
|
|
"inWarehouseSid": "", |
|
|
|
"inWarehouseName": "", |
|
|
|
"inWarehouseRackSid": "", |
|
|
|
"inWarehouseRackCode": "", |
|
|
|
"count": "", |
|
|
|
"amount": "" |
|
|
|
}) |
|
|
|
}, |
|
|
|
@ -441,16 +442,21 @@ |
|
|
|
|
|
|
|
doGoodsDel(sid) { |
|
|
|
console.log("doGoodsDel》》》》", sid) |
|
|
|
|
|
|
|
this.$confirm("是否确定删除此商品？", '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
const index = this.formobj.list.findIndex((item) => item.goodSpuSid === sid) |
|
|
|
const index = this.formobj.list.findIndex((item) => item === row) |
|
|
|
console.log("index》》》》", index) |
|
|
|
this.formobj.list.splice(index, 1) |
|
|
|
|
|
|
|
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) { |
|
|
|
if (this.formobj.pcList[i].number === (index + 1)) { |
|
|
|
this.formobj.pcList.splice(i, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -495,7 +501,7 @@ |
|
|
|
"supplierSid": "", |
|
|
|
"supplierName": "", |
|
|
|
"deliveryDate": "", |
|
|
|
"billState": "", |
|
|
|
"billState": "新建", |
|
|
|
"remarks": "", |
|
|
|
"useOrgSid": "", |
|
|
|
"createOrgSid": "", |
|
|
|
@ -509,11 +515,22 @@ |
|
|
|
showAdd() { |
|
|
|
this.isUpdata = false |
|
|
|
this.title = "【新增】" |
|
|
|
this.getWarehouseList() |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs.dataTable.doLayout() |
|
|
|
}) |
|
|
|
|
|
|
|
console.log("showAdd", this.isUpdata); |
|
|
|
}, |
|
|
|
showEdit(row) { |
|
|
|
this.isUpdata = true |
|
|
|
this.title = "【编辑】" |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs.dataTable.doLayout() |
|
|
|
}) |
|
|
|
|
|
|
|
this.getWarehouseList() |
|
|
|
|
|
|
|
console.log("showEdit", this.isUpdata); |
|
|
|
var params = { |
|
|
|
sid: row.sid |
|
|
|
@ -530,11 +547,18 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
busTypeSelect(val) { |
|
|
|
|
|
|
|
const choose = this.busTypeList.filter((item) => item.sid == val) |
|
|
|
console.log('>>>>>>>>>busTypeSelect', choose) |
|
|
|
this.busTypeKey = choose[0].sid |
|
|
|
this.busTypeValue = choose[0].name |
|
|
|
}, |
|
|
|
supplierNameSelect(val) { |
|
|
|
|
|
|
|
supplierNameSelect(row, val) { |
|
|
|
const choose = this.supplierList.filter((item) => item.sid == val) |
|
|
|
console.log('>>>>>>>>>supplierNameSelect', choose) |
|
|
|
this.supplierSid = choose[0].areaCode |
|
|
|
this.supplierName = choose[0].sid |
|
|
|
}, |
|
|
|
|
|
|
|
getWarehouseList() { |
|
|
|
req2.getWarehouses().then((res) => { |
|
|
|
if (res.success) { |
|
|
|
@ -567,7 +591,7 @@ |
|
|
|
row.warehouseSid = choose[0].sid |
|
|
|
|
|
|
|
}, |
|
|
|
selectWarehouseAreaCode(val) { |
|
|
|
selectWarehouseAreaCode(row, val) { |
|
|
|
console.log("selectWarehouseAreaCode", val); |
|
|
|
|
|
|
|
const choose = this.warehouseRackList.filter((item) => item.sid == val) |
|
|
|
@ -618,7 +642,7 @@ |
|
|
|
this.formobj.list.splice(index, 1) |
|
|
|
|
|
|
|
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) { |
|
|
|
if (this.formobj.pcList[i].number === (index + 1)) { |
|
|
|
if (this.formobj.pcList[i].xh === (index + 1)) { |
|
|
|
this.formobj.pcList.splice(i, 1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
